Merge pull request #2122 from samvera/hyrax-5-fix-css

Hyrax 5 fix css
samvera · Jan 3, 2024 · 3c71cb3 · 3c71cb3
2 parents 0133b09 + 8e4c93f
commit 3c71cb3
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 14 deletions.
diff --git a/app/assets/javascripts/hyrax/app.js.erb b/app/assets/javascripts/hyrax/app.js.erb
@@ -167,25 +167,25 @@ Hyrax = {
     sidebar: function () {
         $('.sidebar-toggle').on('click', function() {
             $('.sidebar').toggleClass('maximized');
-            if ($(window).width() >= 768) {
+            if ($(window).width() >= 992) {
                 $('.main-content').toggleClass('maximized');
             }
         });
 
         $('.sidebar').on('mouseenter', function() {
-            if ($(window).width() < 768) {
+            if ($(window).width() < 992) {
                 $('.sidebar').addClass('maximized');
             }
         });
 
         $('.sidebar').on('mouseleave', function() {
-            if ($(window).width() < 768) {
+            if ($(window).width() < 992) {
                 $('.sidebar').removeClass('maximized');
             }
         });
 
         $(window).on('resize', function() {
-            if ($(window).width() >= 768) {
+            if ($(window).width() >= 992) {
                 $('.sidebar, .main-content').addClass('maximized');
             } else {
                 $('.sidebar, .main-content').removeClass('maximized');

diff --git a/app/assets/stylesheets/hyku.scss b/app/assets/stylesheets/hyku.scss
@@ -423,6 +423,7 @@ nav.navbar.navbar-default.navbar-static-top .container-fluid .row {
 body.public-facing {
   .btn {
     &.btn-primary,
+    &.btn-secondary,
     &.btn-danger {
       color: #fff;
     }
@@ -487,3 +488,13 @@ body.public-facing {
 .mt-20 {
   margin-top: 20px;
 }
+
+.navbar-toggler-icon {
+  background: no-repeat center center;
+  background-size: 100% 100%;
+  content: "";
+  display: inline-block;
+  height: 1.5em;
+  vertical-align: middle;
+  width: 1.5em;
+}
diff --git a/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb b/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb
@@ -8,7 +8,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
+      <%= link_to [main_app, document], "class" => "mr-2", "aria-hidden" => "true" do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
           { class: "d-none d-md-block file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true }
         ) %>

diff --git a/app/views/hyrax/dashboard/works/_list_works.html.erb b/app/views/hyrax/dashboard/works/_list_works.html.erb
@@ -7,7 +7,7 @@
   </td>
   <td>
     <div class='media'>
-      <%= link_to [main_app, document], class: 'media-left' do %>
+      <%= link_to [main_app, document], class: 'mr-2' do %>
         <%# OVERRIDE begin %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
           { class: 'd-none d-md-block file_listing_thumbnail', alt: block_for(name: 'default_work_image_text') || "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" },

diff --git a/app/views/hyrax/homepage/_home_content.html.erb b/app/views/hyrax/homepage/_home_content.html.erb
@@ -5,7 +5,7 @@
   also, to render featured collections
 %>
 
-<div class="<%= @presenter.display_featured_works? || @presenter.display_recently_uploaded? ? 'home-tabs-left col-md-6' : '' %>">
+<div class="<%= @presenter.display_featured_works? || @presenter.display_recently_uploaded? ? 'col-md-6' : '' %>">
   <ul id="homeTabs" class="nav nav-tabs" role="list">
     <%# add check for featured works %>
     <% if @presenter.display_featured_works? %>
@@ -41,10 +41,10 @@
   </div>
 </div><!-- /.col-md-6 -->
 
-<div class="home-tabs-right col-md-6">
+<div class="col-md-6">
   <ul class="nav nav-tabs" role="list">
-    <li class="nav-item active">
-      <a class="nav-link" aria-expanded="true" href="#tab-col2-first" data-toggle="tab">
+    <li class="nav-item">
+      <a class="nav-link active" aria-expanded="true" href="#tab-col2-first" data-toggle="tab">
         <%= t('hyrax.homepage.admin_sets.title') %>
       </a>
     </li>

diff --git a/app/views/hyrax/my/works/_list_works.html.erb b/app/views/hyrax/my/works/_list_works.html.erb
@@ -10,8 +10,8 @@
   <td>
     <div class='media'>
       <%# OVERRIDE begin %>
-      <%= link_to [main_app, document], class: 'media-left' do %>
-        <%= render_thumbnail_tag document, { class: 'hidden-xs file_listing_thumbnail', alt: block_for(name: 'default_work_image_text') || "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" }, { suppress_link: true } %>
+      <%= link_to [main_app, document], class: 'mr-2' do %>
+        <%= render_thumbnail_tag document, { class: 'd-none d-md-block file_listing_thumbnail', alt: block_for(name: 'default_work_image_text') || "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" }, { suppress_link: true } %>
       <% end %>
       <%# OVERRIDE end %>
 

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -65,7 +65,7 @@
   options = Selenium::WebDriver::Options.chrome(args: ["disable-gpu",
                                                        "no-sandbox",
                                                        "whitelisted-ips",
-                                                       "window-size=1400,1400"])
+                                                       "window-size=1920,1080"])
 
   Capybara.register_driver :chrome do |app|
     d = Capybara::Selenium::Driver.new(app,
@@ -83,7 +83,9 @@
   Capybara.server_port = 3001
   Capybara.app_host = "http://#{ENV['WEB_HOST']}:#{Capybara.server_port}"
 else
-  options = Selenium::WebDriver::Options.chrome(args: ["headless", "disable-gpu"])
+  options = Selenium::WebDriver::Options.chrome(args: ["headless",
+                                                       "disable-gpu",
+                                                       "window-size=1920,1080"])
 
   Capybara.register_driver :chrome do |app|
     Capybara::Selenium::Driver.new(