Skip to content

Commit

Permalink
Merge pull request #2430 from samvera/clean-up-featured-collections-ui
Browse files Browse the repository at this point in the history
🧹 Clean up featured collection UI
  • Loading branch information
kirkkwang authored Jan 24, 2025
2 parents c90b207 + f31c42e commit 9f98d14
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 24 deletions.
13 changes: 13 additions & 0 deletions app/assets/stylesheets/hyku.scss
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,15 @@ body.public-facing {
border: 1px solid #ccc;
}

.new_featured_collection_list {
width: 100%;
}

// align featured collections with featured works
#featured_collections {
margin-top: -5px;
}

.mb-30 {
margin-bottom: 30px;
}
Expand Down Expand Up @@ -714,6 +723,10 @@ tr[data-feature="use-iiif-print"] {
display: flex;
flex-wrap: wrap;
justify-content: left;

h3 {
font-size: inherit;
}
}

// slideshow heading
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
padding-bottom: 0 !important;
}

.collections-container,
.recently-uploaded {
a {
img {
Expand Down
4 changes: 2 additions & 2 deletions app/views/hyrax/homepage/_explore_collections.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
) %>
<% end %>
</div>
<div>
<h3>
<%= link_to [hyrax, featured_collection] do %>
<%= markdown(featured_collection.title.first) %>
<% end %>
</div>
</h3>
</div>
</td>
</tr>
19 changes: 6 additions & 13 deletions app/views/hyrax/homepage/_featured_collection_fields.html.erb
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
<div class="featured-item-title d-flex">
<div class="sr-only">
<%= t('hyrax.homepage.featured_collections.document.title_label') %>
</div>
<div class='homepage-work-thumbnail'>
<%= link_to [hyrax, featured] do %>
<%= render_thumbnail_tag(featured.solr_document, {suppress_link: true}) %>
<% end %>
</div>
<div>
<h5>
<div>
<div class="featured-item-title">
<span class="sr-only"><%= t('hyrax.homepage.featured_collections.document.title_label') %></span>
<h3>
<%= link_to [hyrax, featured] do %>
<%= markdown(featured.title.first) %>
<%= render_thumbnail_tag(featured.solr_document, {alt: "#{featured.title.first.to_s} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true})%><%= markdown(featured.title.first) %>
<% end %>
</h5>
</h3>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<% presenter = f.object.presenter %>
<li class="dd-item dd3-item featured-item" data-id="<%= presenter.id %>">
<div class="dd-handle dd3-handle">
<%= t 'hyrax.homepage.featured_works.drag' %>
</div>
<div class="dd-handle dd3-handle"><%= t 'hyrax.homepage.featured_works.drag' %></div>
<div class="dd3-content card">
<%= f.hidden_field :id %>
<%= f.hidden_field :order, data: { property: "order" } %>
<div class="card-body row">
<div class="col-md-12">
<div class="main row">
<div class="col-sm-12">
<% if can? :destroy, FeaturedCollection %>
<h3 class="float-right">
<%= link_to main_app.featured_collection_path(presenter, format: :json),
Expand Down
6 changes: 3 additions & 3 deletions app/views/shared/_appearance_styles.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
@import url(//<%= appearance.font_import_headline_url %>);
<% end %>

body.public-facing { font-family: <%= appearance.font_body_family %>; }
body.public-facing { font-family: <%= appearance.font_body_family %> !important; }
body.public-facing h1,
body.public-facing h2,
body.public-facing h3,
body.public-facing h4,
body.public-facing h5,
body.public-facing h6 { font-family: <%= appearance.font_headline_family %>; }
body.public-facing h6 { font-family: <%= appearance.font_headline_family %> !important; }

/* LINK COLORS */
body.public-facing a,
body.public-facing .dropdown-menu a {
body.public-facing .dropdown-menu a {
color: <%= appearance.link_color %>;
}
body.public-facing a:hover,
Expand Down

0 comments on commit 9f98d14

Please sign in to comment.