From 5a4dd5e163db50703891f4f5646ad4a2397b5676 Mon Sep 17 00:00:00 2001 From: Renee LeBeau Date: Wed, 3 Jun 2026 08:23:49 -0400 Subject: [PATCH 1/4] Revert "IULRDC-196 DataCORE Dashboard accessibility updates" This reverts commit 04e96db10115e929d96022cb35afcf7df505031e. --- .../stylesheets/custom_layout/tweaks.css | 24 ++- app/assets/stylesheets/main.scss | 170 +++++------------- app/assets/stylesheets/mlib-styles.css | 2 +- .../hyrax/admin/admin_sets/_form.html.erb | 8 +- .../admin_sets/_form_visibility.html.erb | 2 +- .../admin/collection_types/_form.html.erb | 8 +- .../_form_participants.html.erb | 3 +- app/views/hyrax/admin/features/index.html.erb | 2 +- .../hyrax/admin/stats/_stats_by_date.html.erb | 4 +- app/views/hyrax/admin/stats/_works.html.erb | 9 +- app/views/hyrax/admin/stats/show.html.erb | 10 +- .../hyrax/admin/workflow_roles/index.html.erb | 4 +- .../hyrax/admin/workflows/index.html.erb | 4 +- .../base/_form_member_of_collections.html.erb | 2 +- app/views/hyrax/base/_items.html.erb | 2 +- app/views/hyrax/base/_member.html.erb | 2 +- app/views/hyrax/base/_share_with.html.erb | 2 +- app/views/hyrax/base/_work_title.erb | 8 +- app/views/hyrax/content_blocks/_form.html.erb | 6 +- app/views/hyrax/dashboard/_sidebar.html.erb | 2 +- .../dashboard/collections/_form.html.erb | 2 +- .../collections/_list_collections.html.erb | 3 +- app/views/hyrax/dashboard/show_admin.html.erb | 10 +- .../embargoes/_list_active_embargoes.html.erb | 60 +++---- .../_list_deactivated_embargoes.html.erb | 19 +- .../_list_expired_active_embargoes.html.erb | 15 +- app/views/hyrax/embargoes/index.html.erb | 8 +- app/views/hyrax/file_sets/_actions.html.erb | 2 +- app/views/hyrax/file_sets/edit.html.erb | 6 +- .../my/collections/_list_collections.html.erb | 3 +- app/views/hyrax/my/collections/_tabs.html.erb | 4 +- app/views/hyrax/my/works/_tabs.html.erb | 4 +- app/views/hyrax/pages/_form.html.erb | 8 +- app/views/rack_attacks/edit.html.erb | 3 +- app/views/robots/edit.html.erb | 2 +- config/locales/hyrax.en.yml | 12 +- 36 files changed, 176 insertions(+), 259 deletions(-) diff --git a/app/assets/stylesheets/custom_layout/tweaks.css b/app/assets/stylesheets/custom_layout/tweaks.css index 613f7134..44cbb11d 100644 --- a/app/assets/stylesheets/custom_layout/tweaks.css +++ b/app/assets/stylesheets/custom_layout/tweaks.css @@ -14,6 +14,10 @@ border-radius: 10px; } +td.status span.enabled { + background-color: #387f38; +} + .text-bold { font-weight: bold; } @@ -112,7 +116,6 @@ form#new_collection, .help-block { font-size: 0.85em; background-color: #ffffff; - color: #595959; } /* To support [more...] and [less...] */ @@ -480,6 +483,25 @@ a { font-weight: bold; } +/* hyrax/_work-show.scss modifications */ +.panel-workflow { + background: #fff; + border-color: #e0e0e0; + + .panel-heading { + background-color: #e6ab5f; + color: #191919; /* improved contrast ratio from #ffffff */ + + a { + color: #191919; /* improved contrast ratio from #ffffff */ + } + } + + .panel-body { + background-color: #f2f1eb; + } +} + /* iu-chimera/_vars-colors.scss modifications */ .nav-pills > li.active > a, .nav-pills > li.active > a:focus, .nav-pills > li.active > a:hover { background: #fff !important;color: #191919 !important;border:1px solid #dbd8d7 !important; /* modified from #ACA39A for improved contrast ratio */ diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 7ad51a51..f31d6aac 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -103,6 +103,10 @@ caption { } } +.dropdown-menu > li > a, .twitter-typeahead .tt-menu > li > a { + color: #000; +} + .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { background-color: transparent; } @@ -148,7 +152,7 @@ caption { .image-masthead { margin: 0; background-image: linear-gradient(rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.7)), - asset-url("home_banner.jpg"); + asset-url("home_banner.jpg"); background-size: cover; } @@ -273,37 +277,16 @@ body.dashboard { padding-top: 2em; } -.sidebar.maximized { - background-color: #525252; -} - -.sidebar.maximized .h5 { - color: #ffffee; -} - -.sidebar .profile { - background-color: #434343; -} - -.sidebar .nav li { - overflow: visible !important; - white-space: wrap; -} - -nav.breadcrumb { - background-color: #ffffff; -} - -nav.breadcrumb ol li:first-child { - margin-left: 0.5em; +ul.breadcrumb li a { + color: #555; } nav.breadcrumb ol li a { - color: #245A90; + color:$primary-link; } -nav.breadcrumb ol li a:hover { - color: #990000; +.nav-tabs > li > a { + color: $primary-link; } /** Search on dash **/ @@ -343,7 +326,7 @@ nav.breadcrumb ol li a:hover { } li > a { - color: $primary-link; + color: $primary-link; } } @@ -381,9 +364,9 @@ span.collection-tag { } .search-result-wrapper { - border-bottom: none; - margin-right: 0; - margin-left: 0; + border-bottom: none; + margin-right: 0; + margin-left: 0; } .search-result-wrapper .search-results-title-row { @@ -418,15 +401,10 @@ table.table.table-striped.related-files  { #new_data_set { .nav-tabs > li > a { - color: $primary-link; + color: $primary-link; } } -#new_data_set .panel, #new_dissertation .panel, form.edit_data_set .panel, #new_batch_upload_item .panel { - background-color: #ffffff; -} - - #metadata { .form-control { border: solid 1px #000 !important; @@ -470,30 +448,8 @@ table.table.table-striped.related-files  { font-size: 1.05em; } -.label-danger { - background-color: #A32824; -} - -.label-info { - background-color: #215A97; -} - -.label-success, td.status span.enabled { - background-color: #2C632C; -} - div.branding-banner-row { - border-top: 0; -} - -.settings_intro { - background-color: white; - padding: .75em; - margin-bottom: 0; -} - -code { - color: #9B1C3F; + border-top: 0; } /** Work Details **/ @@ -501,12 +457,11 @@ code { .work-details-container { border-radius: 4px; -webkit-box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.12), - 0 2px 4px 0 rgba(0, 0, 0, 0.24); + 0 2px 4px 0 rgba(0, 0, 0, 0.24); box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.12), 0 2px 4px 0 rgba(0, 0, 0, 0.24); } .title-header { font-size: 1.5em; - display: inline-block; } .work-description-panel-heading { @@ -537,6 +492,10 @@ code { font-size: 1.5em !important; } + .text-muted { + font-size: 0.5em; + } + span.label.label-warning, span.label.label-danger, span.label.label-info, @@ -592,30 +551,8 @@ ul.tabular li.attribute-fundedby { .panel-workflow .panel-heading { background-color: #e68406; font-weight: bold; - - h2 { - color: #191919; - } } -/* hyrax/_work-show.scss modifications */ -.panel-workflow { - background: #fff; - border-color: #e0e0e0; - - .panel-heading { - background-color: #e6ab5f; - color: #191919; /* improved contrast ratio from #ffffff */ - - a { - color: #191919; /* improved contrast ratio from #ffffff */ - } - } - - .panel-body { - background-color: #f2f1eb; - } -} .panel-items { margin-top: 1em; @@ -661,17 +598,6 @@ ul.tabular li.attribute-fundedby { } } -.stats_section { - background-color: #ffffff; - margin-top: 1em; - margin-left: -.25em; - padding: 1em; -} - -.stats_works h3, .stats_works div { - display: inline-block; -} - a#stats { margin-bottom: 1em; } @@ -692,20 +618,11 @@ a#stats { } } -.pagination li a { - color: #265A87; -} - -.pagination .active span { - background-color: #265A87; - border-color: #265A87; -} - #sortAndPerPage { - border: 0; - padding: .5em; - background-color: #FAFAFA; - border-radius: 4px; + border: 0; + padding: .5em; + background-color: #FAFAFA; + border-radius: 4px; } #per_page-dropdown.btn-group { @@ -773,10 +690,10 @@ div.facets h3 { -webkit-box-orient: horizontal; -webkit-box-direction: normal; -ms-flex-flow: row wrap; - flex-flow: row wrap; + flex-flow: row wrap; -webkit-box-align: center; -ms-flex-align: center; - align-items: center; + align-items: center; margin-bottom: 2em; padding: .75em 0; @@ -785,9 +702,9 @@ div.facets h3 { color:#000; padding-left: .5em; padding-right: .5em; - -webkit-box-flex: 2; - -ms-flex-positive: 2; - flex-grow: 2; + -webkit-box-flex: 2; + -ms-flex-positive: 2; + flex-grow: 2; } } @@ -815,15 +732,15 @@ div.facets h3 { } .hyc-metadata { - padding: 0; - max-width: 100%; + padding: 0; + max-width: 100%; h2 { - margin:0; - padding: 0 .25em; + margin:0; + padding: 0 .25em; } dl { - padding: 0 .25em; + padding: 0 .25em; } } @@ -841,7 +758,7 @@ div.facets h3 { padding: 1em 0; .edit_collection { - margin: 0 1em; + margin: 0 1em; } } @@ -928,13 +845,21 @@ div.facets h3 { color: $primary-link; } + /* ul { + list-style-type: disc; + list-style-position: inside; + } */ ol { list-style-type: decimal; list-style-position: inside; padding: 0.5em 0.5em 0.5em 1.5em; text-indent: -1.0em; } - + /*ul ul, ol ul { + list-style-type: circle; + list-style-position: inside; + margin-left: 15px; + } */ ol ol, ul ol { list-style-type: lower-latin; list-style-position: inside; @@ -1068,11 +993,6 @@ div.facets h3 { justify-content: space-between; } -legend small, h3 small { - color: #595958; -} - - @media (max-width: 767px) { .dropdown-menu > li > a, .twitter-typeahead .tt-menu > li > a { color: #fff; diff --git a/app/assets/stylesheets/mlib-styles.css b/app/assets/stylesheets/mlib-styles.css index 6a9a32ae..1996eda3 100644 --- a/app/assets/stylesheets/mlib-styles.css +++ b/app/assets/stylesheets/mlib-styles.css @@ -159,7 +159,7 @@ body { flex: 0 0 25%; } } body { font-family: 'Source Sans Pro', sans-serif; - color: #525252; + color: #262626; } a { diff --git a/app/views/hyrax/admin/admin_sets/_form.html.erb b/app/views/hyrax/admin/admin_sets/_form.html.erb index 2460c4ed..0c30fe51 100644 --- a/app/views/hyrax/admin/admin_sets/_form.html.erb +++ b/app/views/hyrax/admin/admin_sets/_form.html.erb @@ -1,16 +1,16 @@