diff --git a/.tool-versions b/.tool-versions index 1e42dbc..016e1ed 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,3 @@ ruby 3.2.0 -awscli 2.11.24 \ No newline at end of file +awscli 2.11.24 +yarn 1.22.10 diff --git a/Gemfile.lock b/Gemfile.lock index 5b94592..c2182d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -173,6 +173,8 @@ GEM nio4r (2.5.9) nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) + nokogiri (1.15.4-x86_64-darwin) + racc (~> 1.4) nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) parallel (1.22.1) @@ -324,6 +326,7 @@ GEM PLATFORMS arm64-darwin-21 + x86_64-darwin-20 x86_64-linux DEPENDENCIES @@ -363,4 +366,4 @@ RUBY VERSION ruby 3.2.0p0 BUNDLED WITH - 2.4.8 + 2.4.1 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 59bb5eb..0d11473 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,12 +13,39 @@ *= require_tree . *= require_self */ + +html, body, div.lux { + height: 100%; +} + body { margin: 0; } +/* wraps main content to make lux work */ +/* styled to ensure sticky footer */ +div.lux { + display: flex; + flex-direction: column; +} + +.homepage-img { + margin-top: 1em; +} + #main-content { - margin: 20px 100px; + flex: 1 0 auto; /* part of the sticky footer setup */ + margin: 20px 20px; + /* ensure content stays within boundaries of header / footer, which have + * default max-width of 1170, see + * https://pulibrary.github.io/lux/docs/#/Patterns/LibraryHeader + * and https://github.com/pulibrary/lux/issues/397 + */ + padding: 0 calc(calc(calc(100% - 1170px) / 2)); +} + +.lux-library-footer { + flex-shrink: 0; /* part of sticky footer */ } #list_header { @@ -34,6 +61,14 @@ body { font-size: 20px; } +#card_image_list { + list-style: none; + li img { + border: 2px solid; + margin: 10px; + } +} + .pagination { display: flex; list-style: none; @@ -104,4 +139,4 @@ body { cursor:auto; background-color:#ffffff; border-color:#dee2e6 -} \ No newline at end of file +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f5e8a0d..dc772e0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -24,14 +24,12 @@
- +
<%= yield %>
-
- -
+
- \ No newline at end of file + diff --git a/app/views/shared/_card_image_list.html.erb b/app/views/shared/_card_image_list.html.erb index 205bc13..81baa89 100644 --- a/app/views/shared/_card_image_list.html.erb +++ b/app/views/shared/_card_image_list.html.erb @@ -6,9 +6,9 @@ <% p = (params[:page] || 1).to_i i = index + 1 number = ((p - 1) * 10) + i %> -
  • <%= "Card #{number} of #{@total_cards}" %> +
  • <%= "Card #{number} of #{@total_cards}" %>
    <%= image_tag(image.iiif_url, alt: "Catalog Card") %>
    • <% end %> -<%= paginate @card_images %> \ No newline at end of file +<%= paginate @card_images %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index bec48f4..ae78497 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,6 +1,5 @@ -

    Formerly known as the Electronic Card Catalog

    -<%= image_tag("cardcatalog.gif", alt: "card catalog image") %> +<%= image_tag("cardcatalog.gif", class: "homepage-img", alt: "card catalog image") %>

    This dictionary catalog contains records for items cataloged before 1980.

    @@ -16,4 +15,4 @@

    <%= link_to("Filing rules", filing_rules_path) %>

    -

    Send any comments or questions about Electronic Card Catalog here: <%= link_to("Email Us", "https://library.princeton.edu/help/email-us") %>

    \ No newline at end of file +

    Send any comments or questions about Electronic Card Catalog here: <%= link_to("Email Us", "https://library.princeton.edu/help/email-us") %>