From c7ed552b65a14fbfa3bc06bcce3c9b6b222cce69 Mon Sep 17 00:00:00 2001 From: Amanda Foster <39319859+AKFosterDev@users.noreply.github.com> Date: Tue, 24 Sep 2024 10:10:18 -0700 Subject: [PATCH 1/5] remove duplicated blacklight_gallery --- app/assets/javascripts/application.js | 3 +-- app/assets/javascripts/blacklight_gallery.js | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 app/assets/javascripts/blacklight_gallery.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 48040d159..fb0f0e869 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -27,9 +27,9 @@ //= require tether // Required by Blacklight //= require blacklight/blacklight -//= require blacklight_gallery //= require admin_color_select //= require blacklight_advanced_search +//= require blacklight_gallery/default // Moved the Hyku JS *above* the Hyrax JS to resolve #1187 (following // a pattern found in ScholarSphere) @@ -57,7 +57,6 @@ //= require jquery.flot.pie //= require flot_graph //= require statistics_tab_manager -//= require blacklight_gallery/default // Required for blacklight range limit //= require blacklight_range_limit/range_limit_distro_facets diff --git a/app/assets/javascripts/blacklight_gallery.js b/app/assets/javascripts/blacklight_gallery.js deleted file mode 100644 index 992a7d4df..000000000 --- a/app/assets/javascripts/blacklight_gallery.js +++ /dev/null @@ -1 +0,0 @@ -//= require blacklight_gallery/default \ No newline at end of file From c1aca37ed784312502a48108356655d288d23221 Mon Sep 17 00:00:00 2001 From: Amanda Foster <39319859+AKFosterDev@users.noreply.github.com> Date: Tue, 24 Sep 2024 10:10:49 -0700 Subject: [PATCH 2/5] update collections show structure --- app/views/hyrax/collections/show.html.erb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/views/hyrax/collections/show.html.erb b/app/views/hyrax/collections/show.html.erb index 5ca4d02c8..a86cde178 100644 --- a/app/views/hyrax/collections/show.html.erb +++ b/app/views/hyrax/collections/show.html.erb @@ -13,13 +13,18 @@ <% else %>
<% end %> - -
-

<%= markdown(@presenter.title.first) %>

- <%= @presenter.collection_type_badge %> - <%= @presenter.permission_badge %> +
+
+

<%= markdown(@presenter.title.first) %>

+ <%= @presenter.collection_type_badge %> + <%= @presenter.permission_badge %> +
+
+ <%= pluralize(@presenter.total_viewable_items, t('.item_count')) %> +
+ <% unless @presenter.logo_record.blank? %>
<% @presenter.logo_record.each_with_index do |lr, i| %> @@ -37,10 +42,7 @@ <% end %> <% unless @presenter.total_viewable_items.blank? %> -
-
- <%= pluralize(@presenter.total_viewable_items, t('.item_count')) %>
- +
<% unless @presenter.creator.blank? %>
Created by: <%= @presenter.creator.first %>
<% end %> From 5966044739aac59040c64a8cb524658f1273f355 Mon Sep 17 00:00:00 2001 From: Amanda Foster <39319859+AKFosterDev@users.noreply.github.com> Date: Tue, 24 Sep 2024 10:12:04 -0700 Subject: [PATCH 3/5] update hyku styles --- app/assets/stylesheets/hyku.scss | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/assets/stylesheets/hyku.scss b/app/assets/stylesheets/hyku.scss index 20222928a..7548f944f 100644 --- a/app/assets/stylesheets/hyku.scss +++ b/app/assets/stylesheets/hyku.scss @@ -397,6 +397,11 @@ a.btn.btn-default.restore-default-color.with-color-hint { width: 50%; } } + + // makes hamburger menu visible for mobile + .navbar-toggler-icon { + display: inline-block !important; + } } @media (max-width: 768px) { @@ -574,6 +579,15 @@ span.constraint-value p, .facet-values p { .hyc-bugs .hyc-last-updated, .hyc-title { padding: 0; + + h1 { + color: #000; + } + } + + .hyc-created-by, + .hyc-last-updated { + color: #000 !important; } .hyc-item-count { From 3c32d16573fe74775d7916e3b0378861354b459e Mon Sep 17 00:00:00 2001 From: Amanda Foster <39319859+AKFosterDev@users.noreply.github.com> Date: Tue, 24 Sep 2024 10:12:20 -0700 Subject: [PATCH 4/5] update hyrax styles --- app/assets/stylesheets/hyrax.scss | 83 ++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/hyrax.scss b/app/assets/stylesheets/hyrax.scss index f1dbc018a..fec46907a 100644 --- a/app/assets/stylesheets/hyrax.scss +++ b/app/assets/stylesheets/hyrax.scss @@ -22,7 +22,7 @@ // for catalog search result snippets .highlight { - background: #ffff00; + background: #ffff00; font-weight: 700; } @@ -30,3 +30,84 @@ #collection-edit-controls label.control-label { font-weight: bold !important; } + +/* Collection show page */ +// Contribute back to Hyrax? + +// nav search header +#search-form-header { + // adds bootstrap class to element + label[for="search-field-header"] { + @extend .sr-only; + } + + .form-group { + justify-content: right; + } +} + +.hyc-bugs { + margin-top: 10px; +} + +.hyrax-collections-show { + .document-metadata { + dd { + word-break: break-all; + } + } +} + +#hyc-collection-metadata-total_items, +#hyc-collection-metadata-creator { + align-items: baseline; +} + +// collections gallery view +#documents { + + // hide the bookmark button + .caption-area { + input[name="commit"] { + display: none; + } + } + + .document { + margin-top: 6px; + padding-top: 6px; + + .document-thumbnail { + .img-thumbnail { + padding: 0.25rem; + background-color: #fff; + border: 1px solid #dee2e6; + border-radius: 0.25rem; + width: auto; + height: 320px; + object-fit: cover + } + } + } +} + +// adds bootstrap class to element +.documents-gallery { + @extend .row-cols-lg-4; +} + +// pagination +.hyc-bl-pager { + .pagination { + display: flex; + } +} + +@media (max-width: 768px) { + .hyc-banner { + .hyc-bugs { + flex-wrap: wrap; + } + } +} +/* End Collection show page */ \ No newline at end of file From 033b6033e0670bbada38720282af53069fcf337e Mon Sep 17 00:00:00 2001 From: Amanda Foster <39319859+AKFosterDev@users.noreply.github.com> Date: Tue, 24 Sep 2024 11:18:34 -0700 Subject: [PATCH 5/5] remove unneeded styles --- app/assets/stylesheets/hyrax.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/assets/stylesheets/hyrax.scss b/app/assets/stylesheets/hyrax.scss index fec46907a..e19aa7149 100644 --- a/app/assets/stylesheets/hyrax.scss +++ b/app/assets/stylesheets/hyrax.scss @@ -83,9 +83,6 @@ background-color: #fff; border: 1px solid #dee2e6; border-radius: 0.25rem; - width: auto; - height: 320px; - object-fit: cover } } }