diff --git a/.github/pre-commit b/.github/pre-commit old mode 100755 new mode 100644 diff --git a/css/_controls.scss b/css/_controls.scss index 0dc994da..d7881479 100644 --- a/css/_controls.scss +++ b/css/_controls.scss @@ -3,7 +3,7 @@ input:not([type="checkbox"]):not([type="radio"]) { font-size: 1rem; font-family: var(--font-base-family); - border: solid 1px rgba(0, 0, 0, 0.3); + border: solid 1px var(--color-neutral-200); border-radius: var(--radius-default); padding: 0.75rem; margin: 0; @@ -12,7 +12,7 @@ input:not([type="checkbox"]):not([type="radio"]) { border-color: var(--color-pink-500); } &:not(:focus) { - box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 4px var(--color-neutral-100); } } @@ -60,35 +60,37 @@ select::-ms-expand { display: none; } +fieldset { + display: flex; + gap: 0.5rem; + flex-direction: column; +} + +input[type="checkbox"], +input[type="radio"] { + accent-color: var(--color-teal-400); + border-radius: 0.125rem; + height: 1rem; + width: 1rem; +} + +input[type="radio"] { + border-radius: 50%; +} + .radio-option { - input[type="radio"] { - &:checked + label span.radio-button-unchecked, - &:not(:checked) + label span.radio-button-checked, + display: grid; + gap: 0.5rem; + grid-template-columns: auto 1fr; + grid-template-rows: auto; + & > input[type="radio"] { + grid-row: 1 / -1; &:not(:checked) ~ .radio-option-extra { display: none; } - &:not(:checked) + label { - @include icons.material-symbols { - color: var(--color-neutral-300); - } - } - &:focus + label { - outline: 0; - box-shadow: 0 0 0 2px var(--color-maize-400),0 0 0 3px var(--color-neutral-400); - border-radius: 2px; - } } - @include icons.material-symbols { - color: var(--color-teal-500); - margin-right: 0.25rem; - } - .radio-option-extra { - margin-top: 1rem; - padding-left: 1.5rem; - position: relative; - @include icons.material-symbols { - color: inherit; - } + & > .radio-option-extra { + grid-column: 2 / 3; } } diff --git a/css/_dropdown.scss b/css/_dropdown.scss index ff9f8570..4cc0b797 100644 --- a/css/_dropdown.scss +++ b/css/_dropdown.scss @@ -24,10 +24,15 @@ gap: 0.25rem; font-weight: normal; padding: 0; - @include breakpoints.breakpoint('medium') { - &[aria-expanded="true"] > .username { - text-decoration: underline; - text-decoration-thickness: 0.125rem; + &[aria-expanded="true"] { + & > .material-symbols-rounded { + transform: rotate(180deg); + } + @include breakpoints.breakpoint('medium') { + & > .username { + text-decoration: underline; + text-decoration-thickness: 0.125rem; + } } } } @@ -35,7 +40,7 @@ .dropdown-container { @include breakpoints.breakpoint('medium') { background: white; - border-radius: 0.25rem; + border-radius: 0.25rem; box-shadow: var(--z-space-medium); padding: 1rem 1.5rem; position: absolute; diff --git a/css/_focus.scss b/css/_focus.scss deleted file mode 100644 index 873fbe3d..00000000 --- a/css/_focus.scss +++ /dev/null @@ -1,6 +0,0 @@ -*:not([disabled]):not(#maincontent):not(#chat):focus { - outline: 0; - box-shadow: 0 0 0 2px var(--color-maize-400), - 0 0 0 3px var(--color-neutral-400); - border-radius: 2px !important; -} diff --git a/css/_icons.scss b/css/_icons.scss index ab5caf68..c338cd9f 100644 --- a/css/_icons.scss +++ b/css/_icons.scss @@ -9,3 +9,7 @@ position: relative; top: 0.125rem; }; + +.icon__filled { + font-variation-settings: 'FILL' 1 +} diff --git a/css/_text-notifications.scss b/css/_text-notifications.scss deleted file mode 100644 index 0420b111..00000000 --- a/css/_text-notifications.scss +++ /dev/null @@ -1,11 +0,0 @@ -.text-notifications-label { - display: block; - margin-top: 1rem; -} - -.text-notifications-input-container { - display: grid; - grid-template-columns: 1fr auto; - grid-gap: 1rem; - margin: 1.5rem 0; -} diff --git a/css/index.scss b/css/index.scss index ab0a9a94..b5dd46f7 100644 --- a/css/index.scss +++ b/css/index.scss @@ -1,10 +1,10 @@ @use "defaults"; @use "base"; @use "utilities"; -@use "focus"; @use "skip-links"; @use "site-navigation"; @use "horizontal-navigation"; +@use "icons"; @use "dropdown"; @use "site-footer"; @use "overview-cards"; @@ -12,7 +12,6 @@ @use "tables"; @use "pagination"; @use "messages"; -@use "text-notifications"; @use "tags"; @use "banner"; @use "renew"; diff --git a/js/index.js b/js/index.js index fa5399c2..2cfd329c 100644 --- a/js/index.js +++ b/js/index.js @@ -98,13 +98,8 @@ // Toggle `aria-expanded` as true or false getAriaExpanded = !getAriaExpanded; event.target.setAttribute('aria-expanded', getAriaExpanded); - // Toggle display for dropdown and arrow keys - const getArrowKeys = [...dropdown.children].filter((arrowKey) => { - return arrowKey.innerText.startsWith('keyboard_arrow_'); - }); - [getDropdown, ...getArrowKeys].forEach((toggle) => { - toggle.style.display = toggle.style.display === 'block' ? 'none' : 'block'; - }); + // Toggle display for dropdown + getDropdown.style.display = getDropdown.style.display === 'block' ? 'none' : 'block'; }); // Close dropdown if `Escape` has been pressed or clicked outside of dropdown ['click', 'keyup'].forEach((listener) => { diff --git a/lib/circulation_history_settings_text.rb b/lib/circulation_history_settings_text.rb index 8414029b..efc6589b 100644 --- a/lib/circulation_history_settings_text.rb +++ b/lib/circulation_history_settings_text.rb @@ -51,7 +51,7 @@ class UndecidedKeepHistory < CirculationHistorySettingsText private def text - "We’ve been preserving your #{checkout_history} since spring 2016, which includes any items owned by the U-M Library that you have checked out. You can download your checkout history as a CSV file here. Learn more about checkout history options in our [Privacy Statement](https://lib.umich.edu/about-us/policies/library-privacy-statement/checkout-history-options) and update your preferences below." + "We've been preserving your #{checkout_history} since spring 2016, which includes any items owned by the U-M Library that you have checked out. You can download your checkout history as a CSV file here. Learn more about checkout history options in our [Privacy Statement](https://lib.umich.edu/about-us/policies/library-privacy-statement/checkout-history-options) and update your preferences below." end end diff --git a/views/account-overview/index.erb b/views/account-overview/index.erb index cc930b62..b07fa98c 100644 --- a/views/account-overview/index.erb +++ b/views/account-overview/index.erb @@ -9,7 +9,7 @@

<%=card.description%>

- +
diff --git a/views/fines-and-fees/index.erb b/views/fines-and-fees/index.erb index 17c6f43c..f8435114 100644 --- a/views/fines-and-fees/index.erb +++ b/views/fines-and-fees/index.erb @@ -38,34 +38,28 @@

How much would you like to pay today?

-
+
$ diff --git a/views/layout.erb b/views/layout.erb index 3031f651..cb9da8e4 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -22,20 +22,17 @@ + - - - + <% title = Navigation::Title.for(request.path_info) - %> - <%= title %> | University of Michigan Library - <% description = Navigation::Description.for(request.path_info) %> + <%= title %> | University of Michigan Library diff --git a/views/layout/banner.erb b/views/layout/banner.erb index b61eb59d..d3db431f 100644 --- a/views/layout/banner.erb +++ b/views/layout/banner.erb @@ -1,7 +1,7 @@ <% if session[:confirmed_history_setting] == false %> <% end %> diff --git a/views/layout/navigation.erb b/views/layout/navigation.erb index 2168ae13..9662bf23 100644 --- a/views/layout/navigation.erb +++ b/views/layout/navigation.erb @@ -6,7 +6,7 @@ <% my_pages.pages.each do |page| %>
  • aria-current="page"<% end %>> - <%=page.title%><%= erb :'components/open_in_new', locals: { title: page.title } %> + <%=page.title%><%= erb :'components/open_in_new', locals: { title: page.title } %>
    • <% end %> diff --git a/views/layout/user_drop_down.erb b/views/layout/user_drop_down.erb index 2602d905..2dfbac91 100644 --- a/views/layout/user_drop_down.erb +++ b/views/layout/user_drop_down.erb @@ -3,10 +3,9 @@ <% if session[:uniqname] %>