Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove heading, style updates #181

Merged
merged 7 commits into from
Oct 9, 2023
Merged

Remove heading, style updates #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bba89a
Remove unneeded heading
hackartisan Oct 9, 2023
c9fa7bf
Add yarn to .tool-versions
hackartisan Oct 9, 2023
e91b102
Fix site name in mobile display
hackartisan Oct 9, 2023
e124b09
Narrow main-content area to stay inside header / footer width
hackartisan Oct 9, 2023
fe84651
Remove library footer from containing div
hackartisan Oct 9, 2023
728e7d9
Stick footer to bottom of page
hackartisan Oct 9, 2023
325e131
Style card image list
hackartisan Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
ruby 3.2.0
awscli 2.11.24
awscli 2.11.24
yarn 1.22.10
5 changes: 4 additions & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -324,6 +326,7 @@ GEM

PLATFORMS
arm64-darwin-21
x86_64-darwin-20
x86_64-linux

DEPENDENCIES
Expand Down Expand Up @@ -363,4 +366,4 @@ RUBY VERSION
ruby 3.2.0p0

BUNDLED WITH
2.4.8
2.4.1
39 changes: 37 additions & 2 deletions app/assets/stylesheets/application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
Expand Down Expand Up @@ -104,4 +139,4 @@ body {
cursor:auto;
background-color:#ffffff;
border-color:#dee2e6
}
}
8 changes: 3 additions & 5 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,12 @@

<body>
<div class="lux">
<library-header app-name="Supplementary Catalog" abbr-name="LTR" app-url="<%= root_path %>" theme="dark">
<library-header app-name="Supplementary Catalog" abbr-name="Supplementary" app-url="<%= root_path %>" theme="dark">
</library-header>
<div id="main-content">
<%= yield %>
</div>
<div>
<library-footer></library-footer>
</div>
<library-footer></library-footer>
</div>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions app/views/shared/_card_image_list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<% p = (params[:page] || 1).to_i
i = index + 1
number = ((p - 1) * 10) + i %>
<li><%= "Card #{number} of #{@total_cards}" %>
<li><%= "Card #{number} of #{@total_cards}" %><br />
<%= image_tag(image.iiif_url, alt: "Catalog Card") %></li>
<% end %>
</ul>

<%= paginate @card_images %>
<%= paginate @card_images %>
5 changes: 2 additions & 3 deletions app/views/welcome/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<h1>Formerly known as the Electronic Card Catalog</h1>
<td>
<%= image_tag("cardcatalog.gif", alt: "card catalog image") %>
<%= image_tag("cardcatalog.gif", class: "homepage-img", alt: "card catalog image") %>
<td>

<p>This dictionary catalog contains records for items cataloged before 1980.</p>
Expand All @@ -16,4 +15,4 @@
<hr>
<p><%= link_to("Filing rules", filing_rules_path) %></p>
<hr>
<p>Send any comments or questions about Electronic Card Catalog here: <%= link_to("Email Us", "https://library.princeton.edu/help/email-us") %></p>
<p>Send any comments or questions about Electronic Card Catalog here: <%= link_to("Email Us", "https://library.princeton.edu/help/email-us") %></p>