From 685f67afb3e0d553bcf4b412dded95ca0f36603d Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Thu, 7 Dec 2023 15:28:38 -0600 Subject: [PATCH] Remove unnecessary code --- app/assets/stylesheets/application.sass.scss | 5 - app/assets/stylesheets/base.scss | 25 +---- .../stylesheets/bootstrap-variables.scss | 4 - app/assets/stylesheets/layout.scss | 16 +--- .../stylesheets/modules/feedback-form.scss | 2 +- .../stylesheets/modules/search-bar.scss | 1 - .../stylesheets/modules/skip-to-nav.scss | 33 ------- .../stylesheets/modules/sul-toolbar.scss | 5 - app/assets/stylesheets/print/styles.scss | 93 ------------------- .../stylesheets/searchworks-mixins.scss | 4 - .../stylesheets/sul-styles/sul_footer.scss | 73 --------------- app/assets/stylesheets/sul-variables.scss | 20 ---- app/views/layouts/application.html.erb | 2 - app/views/shared/_skip_to_nav.html.erb | 35 ------- 14 files changed, 6 insertions(+), 312 deletions(-) delete mode 100644 app/assets/stylesheets/modules/skip-to-nav.scss delete mode 100644 app/assets/stylesheets/modules/sul-toolbar.scss delete mode 100644 app/assets/stylesheets/print/styles.scss delete mode 100644 app/assets/stylesheets/searchworks-mixins.scss delete mode 100644 app/assets/stylesheets/sul-styles/sul_footer.scss delete mode 100644 app/views/shared/_skip_to_nav.html.erb diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss index cfaa9f5e..adea8f55 100644 --- a/app/assets/stylesheets/application.sass.scss +++ b/app/assets/stylesheets/application.sass.scss @@ -1,6 +1,5 @@ @import 'deja-vu-font'; @import 'sul-variables'; -@import 'searchworks-mixins'; @import 'bootstrap-variables'; @import 'bootstrap/scss/bootstrap'; @@ -17,14 +16,10 @@ @import 'modules/record-view'; @import 'modules/record-metadata-section'; @import 'modules/search-bar'; -@import 'modules/skip-to-nav'; @import 'modules/sul-footer'; @import 'modules/sul-icons'; -@import 'modules/sul-toolbar'; @import 'modules/top-navbar'; -@import 'print/styles'; - .record-metadata { margin-bottom: 2em; } diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss index 4030d66b..8eaa2af6 100644 --- a/app/assets/stylesheets/base.scss +++ b/app/assets/stylesheets/base.scss @@ -1,11 +1,3 @@ -a { - &.disabled { - color: #ccc; - cursor: not-allowed; - text-decoration: none; - } -} - .su-underline { text-decoration: none; border-bottom: 1px dotted $sul-link-color-border; @@ -13,24 +5,9 @@ a { h1 { font-family: 'dejavu_sansextralight'; + letter-spacing: -0.05em; } h3 { font-weight: 400; - line-height: 1.3em; - margin: 0 0 .4em 0; -} - -dl { - margin-bottom: 15px; -} - -label { - font-weight: normal; -} - -.section { - p, li { - max-width: 45em; - } } \ No newline at end of file diff --git a/app/assets/stylesheets/bootstrap-variables.scss b/app/assets/stylesheets/bootstrap-variables.scss index 2ae77f1e..5a0440da 100644 --- a/app/assets/stylesheets/bootstrap-variables.scss +++ b/app/assets/stylesheets/bootstrap-variables.scss @@ -23,10 +23,6 @@ $navbar-default-link-hover-color: $white; $navbar-default-link-active-color: $white; $navbar-default-toggle-hover-bg: transparent; -// Pagination -$pagination-active-bg: $sul-pagination-active-bg; -$pagination-active-border: $sul-pagination-active-bg; - // Tables $table-bg-accent: $color-beige-10; $table-border-color: #b6b1A9; diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index de6dba24..ab6cc0be 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -11,7 +11,7 @@ border: none; } -#topnav, #search-navbar, #main-container, #sul-footer, #masthead-container { +#topnav, #search-navbar, #main-container, #sul-footer { margin: 0 auto; text-align: left; } @@ -31,19 +31,19 @@ a#sul-logo { } @media (min-width: 768px) { - #topnav, #search-navbar, #main-container, #sul-footer, #masthead-container { + #topnav, #search-navbar, #main-container, #sul-footer { width: 750px; } } @media (min-width: 980px) { - #topnav, #search-navbar, #main-container, #sul-footer, #masthead-container { + #topnav, #search-navbar, #main-container, #sul-footer { width: 970px; } } @media (min-width: 1200px) { - #topnav, #search-navbar, #main-container, #sul-footer, #masthead-container { + #topnav, #search-navbar, #main-container, #sul-footer { width: 1170px; } } @@ -53,12 +53,4 @@ a#sul-logo { #main-container, #search-navbar { padding: 0 15px; } - - #search-navbar-container .search-form { - padding: 0; - } - - #search-navbar .navbar-toggle { - margin-right: 0; - } } diff --git a/app/assets/stylesheets/modules/feedback-form.scss b/app/assets/stylesheets/modules/feedback-form.scss index 73804f64..16769732 100644 --- a/app/assets/stylesheets/modules/feedback-form.scss +++ b/app/assets/stylesheets/modules/feedback-form.scss @@ -1,5 +1,5 @@ #feedback-form { - border-bottom: 3px solid $sul-toolbar-border; + border-bottom: 3px solid $color-beige-40; } .feedback-alert { diff --git a/app/assets/stylesheets/modules/search-bar.scss b/app/assets/stylesheets/modules/search-bar.scss index 4d8b9a7f..4611d054 100644 --- a/app/assets/stylesheets/modules/search-bar.scss +++ b/app/assets/stylesheets/modules/search-bar.scss @@ -1,5 +1,4 @@ #search-navbar-container { - padding: 0; background-color: $color-cardinal-red; box-shadow: 0 4px 8px -2px rgba(0, 0, 0, 0.2) } diff --git a/app/assets/stylesheets/modules/skip-to-nav.scss b/app/assets/stylesheets/modules/skip-to-nav.scss deleted file mode 100644 index bfb02fa3..00000000 --- a/app/assets/stylesheets/modules/skip-to-nav.scss +++ /dev/null @@ -1,33 +0,0 @@ -#skip-link { - margin-left: 10px; - padding-top: 4px; - position: absolute; - top: 0; - z-index: 1; - - .element-invisible { - position: absolute !important; - clip: rect(1px,1px,1px,1px); - overflow: hidden; - height: 1px; - } - - .element-invisible.element-focusable:active, .element-invisible.element-focusable:focus { - position: static !important; - clip: auto; - overflow: visible; - height: auto; - } - - a:focus { - background-color: $sul-skip-to-nav-bg; - border-radius: 0 0 6px 6px; - box-shadow: 0 0 6px #000000; - padding: 6px 15px; - margin: 0; - -moz-border-radius: 0 0 6px 6px; - -moz-box-shadow: 0 0 6px #000000; - -webkit-border-radius: 0 0 6px 6px; - -webkit-box-shadow: 0 0 6px #000000; - } - } diff --git a/app/assets/stylesheets/modules/sul-toolbar.scss b/app/assets/stylesheets/modules/sul-toolbar.scss deleted file mode 100644 index ab344e5a..00000000 --- a/app/assets/stylesheets/modules/sul-toolbar.scss +++ /dev/null @@ -1,5 +0,0 @@ -.sul-toolbar { - @include sul-toolbar-bg-border; - padding: 5px 0px; - margin: 0 0 15px 0px; -} diff --git a/app/assets/stylesheets/print/styles.scss b/app/assets/stylesheets/print/styles.scss deleted file mode 100644 index 15423505..00000000 --- a/app/assets/stylesheets/print/styles.scss +++ /dev/null @@ -1,93 +0,0 @@ -@media only print { - .print-header { - padding-left: 10px; - padding-right: 10px; - text-align: right; - h1 { - font-size: floor(($font-size-base * 1.6)) - } - h2 { - border: none; - font-size: floor(($font-size-base * 1.4)) - } - } - - .breadcrumb.row { - float: left; - } - - #appliedParams { - float:left; - } - - .search_num_of_results { - margin-top: -45px; - } - - // Do not display these elements - .navbar, #topnav, #search-navbar-container, #facets, #sortAndPerPage, .record-toolbar, a.remove, .index-document-functions, footer, #sul-footer-container, #global-footer, .additional-results, .pagination, .library-location-heading img, .record-browse-nearby, .tech-details a, a.btn, .gallery-buttons, .preview-button-container, .google-preview { - display: none !important; - } - a[href]:after { - content: ""; - } - - h3.index_title { - a[href]:after { - content: " (" attr(href) ")"; - } - } - - a, a:visited { - text-decoration: none; border-bottom: none; - } - #documents .document, #documents .brief-document, #documents .gallery-document { - border: 0; - border-bottom: 1px solid #ddd; margin: 0; - } - .gallery .gallery-document { - height: 350px; - } - .callnumber-bar { - font-weight: normal; font-size: 1.1em; - } - #appliedParams { - padding: 0; - } - .constraint-value { - border: 0; - } - .accordion-section .snippet { - display: none; - } - .accordion-section .details { - display: block !important; border: 0; - } - .details dl { - margin-bottom: 0; - } - .accordion-section a.header { - text-align: left; padding-left: 0; font-weight: bold; - } - .accordion-section a.header i { - display: none; - } - .panel-library-location .library-location-heading-text { - padding-left: 0; - } - .document h1 { - margin-top: 0; padding-top: 0; - } - .record-sections .section { - padding-bottom: 0; - } - .panel-heading { - padding-left: 0; - } - #masthead { - border: none; - } - #su-content { - padding-bottom: 0!important; - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/searchworks-mixins.scss b/app/assets/stylesheets/searchworks-mixins.scss deleted file mode 100644 index 4fb937d7..00000000 --- a/app/assets/stylesheets/searchworks-mixins.scss +++ /dev/null @@ -1,4 +0,0 @@ -@mixin sul-toolbar-bg-border { - background-color: $sul-toolbar-bg; - border-bottom: 3px solid $sul-toolbar-border !important; -} diff --git a/app/assets/stylesheets/sul-styles/sul_footer.scss b/app/assets/stylesheets/sul-styles/sul_footer.scss deleted file mode 100644 index 0436f418..00000000 --- a/app/assets/stylesheets/sul-styles/sul_footer.scss +++ /dev/null @@ -1,73 +0,0 @@ -#sul-footer-container { - background-color: $sul-footer-bg-color; - border-top: 1px solid $sul-footer-border-top-color; - -webkit-box-shadow: $sul-footer-shadow; - box-shadow: $sul-footer-shadow; - clear: both; - margin-top: -1 * $footer-height; - min-height: $footer-height; - padding: 0 !important; - position: relative; -} - -#sul-footer { - display: table; - font-size: small; - height: 80px; - margin: 0 auto; - padding: 0; - - ul { - list-style-type: none; - margin: 0; - } - - li { - display: inline; - margin: 0 13px 3px 0; - padding: 0; - - a { - color: $color-blackish; - white-space: nowrap; - } - - a, - a:hover, - a:focus { - border-bottom: 1px dotted $color-gray-60; - text-decoration: none; - } - } -} - -#sul-footer-img { - display: table-cell; - vertical-align: middle; - width: 162px; -} - -#sul-footer-links { - display: table-cell; - padding-left: 15px; - text-align: left; - vertical-align: middle; -} - -@media (min-width: 768px) { - #sul-footer { - width: 750px; - } -} - -@media (min-width: 980px) { - #sul-footer { - width: 970px; - } -} - -@media (min-width: 1200px) { - #sul-footer { - width: 1170px; - } -} diff --git a/app/assets/stylesheets/sul-variables.scss b/app/assets/stylesheets/sul-variables.scss index 7839fb85..eb9efe17 100644 --- a/app/assets/stylesheets/sul-variables.scss +++ b/app/assets/stylesheets/sul-variables.scss @@ -3,36 +3,16 @@ $color-black: #000; $white: #ffffff; $color-cardinal-red: #8c1515; $color-blackish: #2e2d29; -$gray-41-percent: #696969; $color-gray-60: #8a887d; $color-pantone-401: #b6b1a9; $color-beige-40: #d5d0c0; -$color-beige-30: #e3dfd5; -$color-beige-20: #e9e6df; $color-beige-10: #f2f1eb; $color-beige-05: #fbfbf9; -$sul-footer-bg-color: $color-beige-10; -$sul-footer-border-top-color: $color-beige-20; -$footer-height: 200px; -$sul-footer-shadow-color: rgba(0, 0, 0, 0.2); -$sul-footer-shadow: 0 4px 8px -8px $sul-footer-shadow-color inset; - $sul-footer-bg-color: $color-beige-10; $sul-topnavbar-link-color: $color-cardinal-red; $sul-link-color: #006CB8; $sul-link-color-border: $color-pantone-401; -$sul-pagination-active-bg: $gray-41-percent; $sul-body-bg: $color-beige-05; $sul-text-color: $color-black; -$sul-h2-border-color: $color-beige-30; -$sul-skip-to-nav-bg: $color-beige-10; -$sul-toolbar-bg: transparent; -$sul-toolbar-border: $color-beige-40; -$btn-sul-toolbar-bar-color: $color-cardinal-red; -$btn-sul-toolbar-bar-hover-bg: $color-beige-30; $sul-shadow-color: rgba(0, 0, 0, .2); - -// Sizes -$gallery-document-width: 176px; -$gallery-document-height: 400px; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0ae83b98..18b10e41 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -44,8 +44,6 @@ <%= content_for(:head) %> - <%= render 'shared/skip_to_nav' %> -
diff --git a/app/views/shared/_skip_to_nav.html.erb b/app/views/shared/_skip_to_nav.html.erb deleted file mode 100644 index 74f336fe..00000000 --- a/app/views/shared/_skip_to_nav.html.erb +++ /dev/null @@ -1,35 +0,0 @@ -<%# For home & search results page %> -<% if params['controller'] == 'catalog' and params['action'] == 'index' %> - -<% end %> - -<%# For selections page %> -<% if params['controller'] == 'bookmarks' and params['action'] == 'index' %> - -<% end %> - -<%# For record view page %> -<% if params['controller'] == 'catalog' and params['action'] == 'show' %> - -<% end %> - -<%# For advanced search page %> -<% if params['controller'] == 'advanced' and params['action'] == 'index' %> - -<% end %>