diff --git a/app/assets/stylesheets/oregon_digital/_buttons.scss b/app/assets/stylesheets/oregon_digital/_buttons.scss index 4ee3e1aef..8bda95dff 100644 --- a/app/assets/stylesheets/oregon_digital/_buttons.scss +++ b/app/assets/stylesheets/oregon_digital/_buttons.scss @@ -52,6 +52,9 @@ input.link { } } } +.btn-sm { + font-size: 14px; +} .btn-lg { padding: 16px 24px; font-size: 18px; diff --git a/app/assets/stylesheets/oregon_digital/_search.scss b/app/assets/stylesheets/oregon_digital/_search.scss index 6cc9c23ac..0bfea6753 100644 --- a/app/assets/stylesheets/oregon_digital/_search.scss +++ b/app/assets/stylesheets/oregon_digital/_search.scss @@ -339,38 +339,42 @@ em { div.pagination { display: flex; justify-content: center; + margin: 20px 0; } -ul.pagination li { - &.active span { - background-color: $contrast-orange; - border: none; - color: $navy-blue; - } - &.next span, - &.next a, - &.previous span, - &.previous a { - background: none; - } - &.disabled { - span, - span:hover, - span:focus, - a, - a:hover, - a:focus { - color: $dark-grey; +ul.pagination { + align-items: center; + li { + &.active span.page-link { + background-color: $contrast-orange; + border: none; + color: $navy-blue; + } + &.next span, + &.next a, + &.previous span, + &.previous a { + background: none; + } + &.disabled { + span, + span:hover, + span:focus, + a, + a:hover, + a:focus { + color: $dark-grey; + } } - } - a, - span { - background-color: $very-light-grey; - border: none; - margin: 0 .25em; + a, + span { + background-color: $very-light-grey; + border: none; + margin: 0 .25em; + padding: 6px 12px; + } } } - /* Gallery specific */ #content { flex-direction: column; diff --git a/app/assets/stylesheets/oregon_digital/explore_collections/_buttons.scss b/app/assets/stylesheets/oregon_digital/explore_collections/_buttons.scss index b27d10177..2b79f5bd0 100644 --- a/app/assets/stylesheets/oregon_digital/explore_collections/_buttons.scss +++ b/app/assets/stylesheets/oregon_digital/explore_collections/_buttons.scss @@ -64,7 +64,7 @@ $triangle-size: $block-border-size*4; width:$triangle-size*2; height:$triangle-size*2; overflow:hidden; - position:absolute; + position:relative; visibility: hidden; } .notch::before, @@ -89,12 +89,11 @@ $triangle-size: $block-border-size*4; /* Notch on Bottom Middle */ .notch-xMiddle-yBottom { - bottom:-$triangle-size*2; left:50%; transform:rotate(90deg) translateY(50%); } -@media (min-width: breakpoint-min(sm)) { +@media (min-width: breakpoint-min(md)) { $block-border-size: 5px; $triangle-size: $block-border-size*4; .notch { @@ -113,12 +112,6 @@ $triangle-size: $block-border-size*4; left:-($triangle-size + $block-border-size*2); } - /* Notch on Bottom Middle */ - .notch-xMiddle-yBottom { - bottom:-$triangle-size*2; - // left:50%; - // transform:rotate(90deg) translateY(50%); - } #explore-tabs a { height: 55px; width: 150px; diff --git a/app/assets/stylesheets/oregon_digital/explore_collections/_masonry_view.scss b/app/assets/stylesheets/oregon_digital/explore_collections/_masonry_view.scss index e91816cd5..8a1800b39 100644 --- a/app/assets/stylesheets/oregon_digital/explore_collections/_masonry_view.scss +++ b/app/assets/stylesheets/oregon_digital/explore_collections/_masonry_view.scss @@ -6,13 +6,13 @@ border-top: $very-light-grey 2px solid; width: calc(16.666% - 20px); - @media (max-width: breakpoint-min(md)) { + @media (max-width: breakpoint-min(xl)) { & { width: calc(25% - 30px); } } - @media (max-width: breakpoint-min(sm)) { + @media (max-width: breakpoint-min(md)) { & { width: calc(50% - 20px); } @@ -26,13 +26,13 @@ #masonry-gutter-sizer { width: 20px; - @media (max-width: breakpoint-min(md)) { + @media (max-width: breakpoint-min(xl)) { & { width: 30px; } } - @media (max-width: breakpoint-min(sm)) { + @media (max-width: breakpoint-min(md)) { & { width: 40px; } diff --git a/app/assets/stylesheets/oregon_digital/explore_collections/_showcase.scss b/app/assets/stylesheets/oregon_digital/explore_collections/_showcase.scss index 8fb46271e..676d8590f 100644 --- a/app/assets/stylesheets/oregon_digital/explore_collections/_showcase.scss +++ b/app/assets/stylesheets/oregon_digital/explore_collections/_showcase.scss @@ -31,7 +31,7 @@ form#explore-collection-search { #sortAndPerPage.explore-collections-per-page { padding: 2em 0 1em 0; - @media (max-width: breakpoint-max(xs)) { + @media (max-width: breakpoint-max(sm)) { & { padding-left: 2em; padding-right: 2em; @@ -44,7 +44,7 @@ form#explore-collection-search { font-weight: bold; padding-bottom: 2em; - @media (max-width: breakpoint-max(sm)) { + @media (max-width: breakpoint-max(lg)) { & { display: block; } @@ -52,13 +52,13 @@ form#explore-collection-search { } .explore-collections-search-widgets { - @media (max-width: breakpoint-max(sm)) { + @media (max-width: breakpoint-max(lg)) { & { float: left !important; } } - @media (min-width: breakpoint-max(sm)) { + @media (min-width: breakpoint-max(lg)) { transform: 0 15%; } diff --git a/app/controllers/oregon_digital/explore_collections_controller.rb b/app/controllers/oregon_digital/explore_collections_controller.rb index 3b7408b7a..4dc7f5ad0 100644 --- a/app/controllers/oregon_digital/explore_collections_controller.rb +++ b/app/controllers/oregon_digital/explore_collections_controller.rb @@ -106,7 +106,7 @@ def build_breadcrumbs all: 'all', osu: 'osu', uo: 'uo', - my: 'my collections' + my: 'my' }.freeze def search_service diff --git a/app/views/_masthead.html.erb b/app/views/_masthead.html.erb index 92e57b1e3..9dfee8447 100644 --- a/app/views/_masthead.html.erb +++ b/app/views/_masthead.html.erb @@ -1,6 +1,6 @@
-