From c0fea5186c63ef4261021ebfeba7633b72fde922 Mon Sep 17 00:00:00 2001 From: colinxfleming Date: Sun, 1 Dec 2024 13:40:25 -0500 Subject: [PATCH 1/9] run sass-migrator module --migrate-deps filename --- .../stylesheets/styles/bootstrap_config.scss | 3 +- app/assets/stylesheets/styles/budget_bar.scss | 6 +- app/assets/stylesheets/styles/buttons.scss | 61 ++++++++++--------- app/assets/stylesheets/styles/call_list.scss | 10 +-- app/assets/stylesheets/styles/calls.scss | 10 +-- .../stylesheets/styles/clinic_finder.scss | 4 +- app/assets/stylesheets/styles/devise.scss | 4 +- app/assets/stylesheets/styles/events.scss | 6 +- app/assets/stylesheets/styles/flash.scss | 2 +- app/assets/stylesheets/styles/globals.scss | 14 ++--- app/assets/stylesheets/styles/lines.scss | 6 +- app/assets/stylesheets/styles/navbar.scss | 15 ++--- app/assets/stylesheets/styles/pagination.scss | 8 +-- .../stylesheets/styles/patient_edit.scss | 14 ++--- .../stylesheets/styles/patient_menu.scss | 16 ++--- app/assets/stylesheets/styles/tables.scss | 8 +-- app/assets/stylesheets/styles/tooltips.scss | 8 +-- app/assets/stylesheets/styles/users.scss | 4 +- 18 files changed, 101 insertions(+), 98 deletions(-) diff --git a/app/assets/stylesheets/styles/bootstrap_config.scss b/app/assets/stylesheets/styles/bootstrap_config.scss index 2c4945e5a..85bb05533 100644 --- a/app/assets/stylesheets/styles/bootstrap_config.scss +++ b/app/assets/stylesheets/styles/bootstrap_config.scss @@ -1,8 +1,9 @@ +@use "sass:map"; $spacer: .5rem !default; $spacers: () !default; // stylelint-disable-next-line scss/dollar-variable-default -$spacers: map-merge( +$spacers: map.merge( ( 0: 0, 1: ($spacer * .25), //.125 rem diff --git a/app/assets/stylesheets/styles/budget_bar.scss b/app/assets/stylesheets/styles/budget_bar.scss index 72fd0b923..7d27c78dd 100644 --- a/app/assets/stylesheets/styles/budget_bar.scss +++ b/app/assets/stylesheets/styles/budget_bar.scss @@ -1,11 +1,11 @@ // Styling related to the budget bar utility. -@import './_variables'; +@use '_variables'; $budget-bar-font-size: 14px; .expenditure-block { - border-right: 1px solid $black; - color: $black !important; + border-right: 1px solid variables.$black; + color: variables.$black !important; font-size: $budget-bar-font-size; } diff --git a/app/assets/stylesheets/styles/buttons.scss b/app/assets/stylesheets/styles/buttons.scss index ee6b9e2b8..2949f9a1a 100644 --- a/app/assets/stylesheets/styles/buttons.scss +++ b/app/assets/stylesheets/styles/buttons.scss @@ -1,69 +1,70 @@ // Button styling. -@import './_variables'; +@use "sass:color"; +@use '_variables'; // btn-primary .btn-primary { @extend .btn-primary; - background-color: $daria-color; + background-color: variables.$daria-color; border: none; - color: $white; + color: variables.$white; margin-bottom: 2px; - font-size: $font-size; + font-size: variables.$font-size; } .btn-primary:hover { - background-color: lighten($daria-color,15%); + background-color: color.adjust(variables.$daria-color,$lightness: 15%); } .btn-primary:focus { - background-color: lighten($daria-color,15%); - color: $white; + background-color: color.adjust(variables.$daria-color,$lightness: 15%); + color: variables.$white; text-decoration: none; } // btn-danger .btn-danger { - background-color: $dark-red !important; - border-color: $dark-red !important; + background-color: variables.$dark-red !important; + border-color: variables.$dark-red !important; } // btn-warning .btn-warning { - color: $black; - border-color: $daria-color; - background-color: $white; + color: variables.$black; + border-color: variables.$daria-color; + background-color: variables.$white; &:hover { - background-color: $daria-color-lt; - border-color: $daria-color; + background-color: variables.$daria-color-lt; + border-color: variables.$daria-color; } &:active { - background-color: $soft-blue !important; + background-color: variables.$soft-blue !important; } &:focus { - background-color: $daria-color; + background-color: variables.$daria-color; &:hover { - background-color: $daria-color-lt; + background-color: variables.$daria-color-lt; } } } // btn-success .btn-success { - background-color: $daria-color; - border-color: $daria-color; + background-color: variables.$daria-color; + border-color: variables.$daria-color; &:hover { - background-color: $daria-color-lt; - border-color: $daria-color; + background-color: variables.$daria-color-lt; + border-color: variables.$daria-color; } &:active { - background-color: $soft-blue !important; + background-color: variables.$soft-blue !important; } &:focus { - background-color: $daria-color; + background-color: variables.$daria-color; &:hover { - background-color: $daria-color-lt; + background-color: variables.$daria-color-lt; } } } @@ -76,19 +77,19 @@ // Disabled button styling @mixin disabled-button { - color: $white; + color: variables.$white; background-color: gray; - border-color: $daria-color; + border-color: variables.$daria-color; &:hover { background-color: gray; - border-color: $daria-color; + border-color: variables.$daria-color; } &:focus { background-color: gray; - border-color: $daria-color; + border-color: variables.$daria-color; &:hover { background-color: gray; - border-color: $daria-color; + border-color: variables.$daria-color; } } } @@ -103,5 +104,5 @@ // Styling for the cancel button on pledge modal .btn[data-orientation='cancel'] { - color: $red; + color: variables.$red; } diff --git a/app/assets/stylesheets/styles/call_list.scss b/app/assets/stylesheets/styles/call_list.scss index 9222d8b8e..49702a98b 100644 --- a/app/assets/stylesheets/styles/call_list.scss +++ b/app/assets/stylesheets/styles/call_list.scss @@ -1,10 +1,10 @@ // Styling related to the call list and patient search. -@import './_variables'; +@use '_variables'; .call-icon { - color: $white; - background-color: $phone-icon-blue; + color: variables.$white; + background-color: variables.$phone-icon-blue; padding: 5px; border-radius: 50%; } @@ -29,7 +29,7 @@ // Drag and drop functionality/stylings // Activated when dragging around .ui-state-highlight { - background-color: $lavendar !important; + background-color: variables.$lavendar !important; } .active-item-shadow { -webkit-box-shadow: rgba(133,133,133,0.1) 0 0 5px 2px,rgba(133,133,133,0.3) 0 0 2px; @@ -38,5 +38,5 @@ } // Keeps the rows white when dragging around #call_list tr { - background-color: $white; + background-color: variables.$white; } diff --git a/app/assets/stylesheets/styles/calls.scss b/app/assets/stylesheets/styles/calls.scss index 1db919f22..deb750df0 100644 --- a/app/assets/stylesheets/styles/calls.scss +++ b/app/assets/stylesheets/styles/calls.scss @@ -1,27 +1,27 @@ // Styling related to log-a-call modals. -@import './_variables'; +@use '_variables'; // Core new call modal .calls-layout { padding: 1rem .5rem 1rem 2rem; .calls-request { - font-size: $font-size-large; + font-size: variables.$font-size-large; } .calls-phone { - font-size: $font-size-xlarge; + font-size: variables.$font-size-xlarge; font-weight: 900; } .calls-response { - font-size: $font-size; + font-size: variables.$font-size; text-decoration: underline; } .calls-btn { - font-size: $font-size; + font-size: variables.$font-size; padding: 10px 40px; } } diff --git a/app/assets/stylesheets/styles/clinic_finder.scss b/app/assets/stylesheets/styles/clinic_finder.scss index 59ad711ed..e961b5889 100644 --- a/app/assets/stylesheets/styles/clinic_finder.scss +++ b/app/assets/stylesheets/styles/clinic_finder.scss @@ -1,9 +1,9 @@ // Styling related to the clinic finder utility. -@import './_variables'; +@use '_variables'; .clinic_finder_container { - background-color: $grey-color; + background-color: variables.$grey-color; border-style: solid; border-color: black; border-width: thin; diff --git a/app/assets/stylesheets/styles/devise.scss b/app/assets/stylesheets/styles/devise.scss index 0c2cfe801..cd7677472 100644 --- a/app/assets/stylesheets/styles/devise.scss +++ b/app/assets/stylesheets/styles/devise.scss @@ -1,12 +1,12 @@ // Styles pertaining to the login form or other devise-related views. -@import './_variables'; +@use '_variables'; .authform { @extend .card-header; @extend .mx-auto; padding-top: 20px; - border: 1px solid $light-gray; + border: 1px solid variables.$light-gray; border-radius: 6px; margin: 0 auto; } diff --git a/app/assets/stylesheets/styles/events.scss b/app/assets/stylesheets/styles/events.scss index f1f7949d7..597f75c6a 100644 --- a/app/assets/stylesheets/styles/events.scss +++ b/app/assets/stylesheets/styles/events.scss @@ -1,13 +1,13 @@ // Styling for the events log on the patient dashboard. -@import './_variables'; +@use '_variables'; svg.event-item { border-radius: 50%; margin-right: 1em; color: white; padding: 4px; - background-color: $teal; + background-color: variables.$teal; font-size: 1.25em; &.fa-thumbs-up { @@ -15,7 +15,7 @@ svg.event-item { } &.fa-comment { - background-color: $light-gray; + background-color: variables.$light-gray; color: black; } } diff --git a/app/assets/stylesheets/styles/flash.scss b/app/assets/stylesheets/styles/flash.scss index 20b17459e..a0dd2179f 100644 --- a/app/assets/stylesheets/styles/flash.scss +++ b/app/assets/stylesheets/styles/flash.scss @@ -1,5 +1,5 @@ // Styling around flash messages. -@import './_variables'; +@use '_variables'; #flash { position: fixed; diff --git a/app/assets/stylesheets/styles/globals.scss b/app/assets/stylesheets/styles/globals.scss index 8e317996f..84bd31c5e 100644 --- a/app/assets/stylesheets/styles/globals.scss +++ b/app/assets/stylesheets/styles/globals.scss @@ -1,17 +1,17 @@ // Global styling patterns. -@import "./_variables"; -@import "./vendor/googleapis_source_sans_pro"; +@use "_variables"; +@use "vendor/googleapis_source_sans_pro"; @charset "utf-8"; html { - font-size: $font-size; + font-size: variables.$font-size; } body { font-family: "Source Sans Pro", sans-serif; - font-size: $font-size; + font-size: variables.$font-size; } main { @@ -65,7 +65,7 @@ label { // Links a { - color: $link-blue; + color: variables.$link-blue; text-decoration: none; } @@ -73,12 +73,12 @@ a:hover, a:active, a:visited, a:focus { - color: $dark-blue; + color: variables.$dark-blue; text-decoration: underline; } .border-bottom { - border-bottom: 1px solid $black; + border-bottom: 1px solid variables.$black; padding-bottom: 10px; } diff --git a/app/assets/stylesheets/styles/lines.scss b/app/assets/stylesheets/styles/lines.scss index bcfc4ad17..1f687cdb1 100644 --- a/app/assets/stylesheets/styles/lines.scss +++ b/app/assets/stylesheets/styles/lines.scss @@ -1,7 +1,7 @@ // Styling related to the lines form. -@import 'bootstrap/scss/bootstrap'; -@import './_variables'; +@use 'bootstrap/scss/bootstrap'; +@use './_variables'; .lines-form { input[type="radio"] { @@ -12,7 +12,7 @@ } label { - font-size: $font-size-medium; + font-size: variables.$font-size-medium; } .form-check-label { diff --git a/app/assets/stylesheets/styles/navbar.scss b/app/assets/stylesheets/styles/navbar.scss index 3de529a42..c97a63afd 100644 --- a/app/assets/stylesheets/styles/navbar.scss +++ b/app/assets/stylesheets/styles/navbar.scss @@ -1,30 +1,31 @@ // Styling for the navbar. -@import './_variables'; +@use "sass:color"; +@use '_variables'; .navbar-inverse{ - background-color: $light-gray; + background-color: variables.$light-gray; border: none; .navbar-header > a, .navbar-nav > li > a { - color: $daria-color; + color: variables.$daria-color; &:hover{ - color: lighten($daria-color, 20%); + color: color.adjust(variables.$daria-color, $lightness: 20%); text-decoration: underline; } &:visited{ - color: $dark-blue; + color: variables.$dark-blue; } } .navbar-text { - color: $daria-color; + color: variables.$daria-color; } .navbar-text-alt { - color: $grey-color; + color: variables.$grey-color; } } diff --git a/app/assets/stylesheets/styles/pagination.scss b/app/assets/stylesheets/styles/pagination.scss index 850b05348..f148a2fca 100644 --- a/app/assets/stylesheets/styles/pagination.scss +++ b/app/assets/stylesheets/styles/pagination.scss @@ -1,15 +1,15 @@ // Styling for Kaminari pagination -@import './_variables'; +@use '_variables'; span.page, span.first, span.prev, span.next, span.last { - font-size: $font-size; + font-size: variables.$font-size; margin-right: .5rem; } #accountants-pagination { .pagination-entries { - font-size: $font-size; + font-size: variables.$font-size; display: inline-block; } @@ -17,7 +17,7 @@ span.page, span.first, span.prev, span.next, span.last { display: inline-block; span { - font-size: $font-size; + font-size: variables.$font-size; } } } diff --git a/app/assets/stylesheets/styles/patient_edit.scss b/app/assets/stylesheets/styles/patient_edit.scss index 3c5ee4206..43cc7a9d0 100644 --- a/app/assets/stylesheets/styles/patient_edit.scss +++ b/app/assets/stylesheets/styles/patient_edit.scss @@ -1,20 +1,20 @@ // Styling related to the larger patient edit page. -@import './_variables'; +@use '_variables'; #patient_dashboard { - border-bottom: 1px solid $black; + border-bottom: 1px solid variables.$black; padding: 15px 0; } #sections { - border-left: 1px solid $black; + border-left: 1px solid variables.$black; padding-left: 9.5%; } .pledge-error { - color: $red; - font-size: $font-size; + color: variables.$red; + font-size: variables.$font-size; } // Overrides/styling related to multistep modal @@ -25,7 +25,7 @@ font-size: 75%; font-weight: 700; line-height: 1; - color: $white; + color: variables.$white; text-align: center; white-space: nowrap; vertical-align: baseline; @@ -34,7 +34,7 @@ } .label-success { - background-color: $daria-color; + background-color: variables.$daria-color; } .hide { diff --git a/app/assets/stylesheets/styles/patient_menu.scss b/app/assets/stylesheets/styles/patient_menu.scss index 43d8f4e97..1e0e686c6 100644 --- a/app/assets/stylesheets/styles/patient_menu.scss +++ b/app/assets/stylesheets/styles/patient_menu.scss @@ -1,18 +1,18 @@ // Styling for the patient nav menu. -@import './_variables'; +@use '_variables'; .abortion-left-menu.nav-pills { - font-size: $font-size; + font-size: variables.$font-size; .nav-link { - color: $soft-blue; - background-color: $white; + color: variables.$soft-blue; + background-color: variables.$white; } a.nav-link.active { - color: $daria-color; - background-color: $white; + color: variables.$daria-color; + background-color: variables.$white; // This adds the arrow icon to mark selected status &:before { @@ -22,7 +22,7 @@ content: "\f054"; margin-left: -1.5em; padding-right: .85em; - color: $daria-color; + color: variables.$daria-color; } .svg-inline--fa { @@ -36,7 +36,7 @@ a.submit-pledge-button { text-decoration: none; .submit-btn, .cancel-btn { - font-size: $font-size; + font-size: variables.$font-size; font-weight: bold; } } diff --git a/app/assets/stylesheets/styles/tables.scss b/app/assets/stylesheets/styles/tables.scss index d04f20b28..9e1d97d0c 100644 --- a/app/assets/stylesheets/styles/tables.scss +++ b/app/assets/stylesheets/styles/tables.scss @@ -1,14 +1,14 @@ // Additional styling for table elements. -@import './_variables'; +@use '_variables'; table.border-side { th { - font-size: $font-size-small; - color: $dark-grey; + font-size: variables.$font-size-small; + color: variables.$dark-grey; text-transform: uppercase; letter-spacing: 1.5px; - background: $light-gray; + background: variables.$light-gray; padding-left: 0px !important; } diff --git a/app/assets/stylesheets/styles/tooltips.scss b/app/assets/stylesheets/styles/tooltips.scss index e6c2a3174..4b2b41ebc 100644 --- a/app/assets/stylesheets/styles/tooltips.scss +++ b/app/assets/stylesheets/styles/tooltips.scss @@ -1,13 +1,13 @@ // Styling around bootstrap tooltips. -@import './_variables'; +@use '_variables'; .tooltip-header-help { - color: $grey-color; - border-bottom: 1px dotted $grey-color; + color: variables.$grey-color; + border-bottom: 1px dotted variables.$grey-color; cursor: pointer; } .tooltip-inner { - font-size: $font-size-small; + font-size: variables.$font-size-small; } diff --git a/app/assets/stylesheets/styles/users.scss b/app/assets/stylesheets/styles/users.scss index cf92b2b1a..71864f940 100644 --- a/app/assets/stylesheets/styles/users.scss +++ b/app/assets/stylesheets/styles/users.scss @@ -1,6 +1,6 @@ // Styling specific to users routes. -@import './_variables'; +@use '_variables'; // Make data-sort elements in user list a pointer. #user-list th[data-sort] { @@ -9,6 +9,6 @@ // Highlight user-rows with a light gray. .user-row:hover { - background-color: $light-gray; + background-color: variables.$light-gray; border: 2px solid gray; } From 635558eb6ac5b364e5c9393855a1c844c1dabdff Mon Sep 17 00:00:00 2001 From: colinxfleming Date: Sun, 1 Dec 2024 13:41:03 -0500 Subject: [PATCH 2/9] manually migrate entrypoint --- .../stylesheets/application.bootstrap.scss | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/app/assets/stylesheets/application.bootstrap.scss b/app/assets/stylesheets/application.bootstrap.scss index d57bc9cf9..3da09303b 100644 --- a/app/assets/stylesheets/application.bootstrap.scss +++ b/app/assets/stylesheets/application.bootstrap.scss @@ -1,25 +1,25 @@ // Major library config -@import './styles/bootstrap'; -@import './styles/vendor/jquery-ui'; +@use './styles/bootstrap'; +@use './styles/vendor/jquery-ui'; // Custom styling -@import './styles/globals'; -@import './styles/call_list'; -@import './styles/devise'; -@import './styles/users'; -@import './styles/budget_bar'; -@import './styles/clinic_finder'; -@import './styles/calls'; -@import './styles/pagination'; -@import './styles/events'; -@import './styles/patient_menu'; -@import './styles/patient_edit'; -@import './styles/tables'; -@import './styles/footer'; -@import './styles/modals'; -@import './styles/navbar'; -@import './styles/tooltips'; -@import './styles/lines'; -@import './styles/flash'; -@import './styles/forms'; -@import './styles/buttons'; +@use './styles/globals'; +@use './styles/call_list'; +@use './styles/devise'; +@use './styles/users'; +@use './styles/budget_bar'; +@use './styles/clinic_finder'; +@use './styles/calls'; +@use './styles/pagination'; +@use './styles/events'; +@use './styles/patient_menu'; +@use './styles/patient_edit'; +@use './styles/tables'; +@use './styles/footer'; +@use './styles/modals'; +@use './styles/navbar'; +@use './styles/tooltips'; +@use './styles/lines'; +@use './styles/flash'; +@use './styles/forms'; +@use './styles/buttons'; From 54671d2a657c8b2dd0c43a486083cad2ddeef612 Mon Sep 17 00:00:00 2001 From: colinxfleming Date: Sun, 1 Dec 2024 13:56:10 -0500 Subject: [PATCH 3/9] manual adjustments to get scss to build again and look ok --- app/assets/stylesheets/styles/devise.scss | 1 + app/assets/stylesheets/styles/events.scss | 1 + app/assets/stylesheets/styles/flash.scss | 2 ++ app/assets/stylesheets/styles/forms.scss | 4 +++- app/assets/stylesheets/styles/globals.scss | 1 + app/assets/stylesheets/styles/lines.scss | 2 +- app/assets/stylesheets/styles/patient_edit.scss | 1 + 7 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/styles/devise.scss b/app/assets/stylesheets/styles/devise.scss index cd7677472..fe6e8c6a7 100644 --- a/app/assets/stylesheets/styles/devise.scss +++ b/app/assets/stylesheets/styles/devise.scss @@ -1,5 +1,6 @@ // Styles pertaining to the login form or other devise-related views. +@use 'bootstrap/scss/bootstrap'; @use '_variables'; .authform { diff --git a/app/assets/stylesheets/styles/events.scss b/app/assets/stylesheets/styles/events.scss index 597f75c6a..7bdebda9c 100644 --- a/app/assets/stylesheets/styles/events.scss +++ b/app/assets/stylesheets/styles/events.scss @@ -1,5 +1,6 @@ // Styling for the events log on the patient dashboard. +@use 'bootstrap/scss/bootstrap'; @use '_variables'; svg.event-item { diff --git a/app/assets/stylesheets/styles/flash.scss b/app/assets/stylesheets/styles/flash.scss index a0dd2179f..ec67301ba 100644 --- a/app/assets/stylesheets/styles/flash.scss +++ b/app/assets/stylesheets/styles/flash.scss @@ -1,4 +1,6 @@ // Styling around flash messages. + +@use 'bootstrap/scss/bootstrap'; @use '_variables'; #flash { diff --git a/app/assets/stylesheets/styles/forms.scss b/app/assets/stylesheets/styles/forms.scss index d8772a558..d54830062 100644 --- a/app/assets/stylesheets/styles/forms.scss +++ b/app/assets/stylesheets/styles/forms.scss @@ -1,5 +1,7 @@ // Styling around forms. +@use './variables'; + // Override rails_bootstrap_forms checkbox styling .form-check label { min-height: 20px; @@ -13,7 +15,7 @@ // Override rails bootstrap form-text for accessible color contrast .form-text { - color: $grey-color !important; + color: variables.$grey-color !important; } // On date inputs, don't do the annoying diff --git a/app/assets/stylesheets/styles/globals.scss b/app/assets/stylesheets/styles/globals.scss index 84bd31c5e..ea6e21a63 100644 --- a/app/assets/stylesheets/styles/globals.scss +++ b/app/assets/stylesheets/styles/globals.scss @@ -2,6 +2,7 @@ @use "_variables"; @use "vendor/googleapis_source_sans_pro"; +@use 'bootstrap/scss/bootstrap'; @charset "utf-8"; diff --git a/app/assets/stylesheets/styles/lines.scss b/app/assets/stylesheets/styles/lines.scss index 1f687cdb1..18c1da80c 100644 --- a/app/assets/stylesheets/styles/lines.scss +++ b/app/assets/stylesheets/styles/lines.scss @@ -16,6 +16,6 @@ } .form-check-label { - @extend .ml-8; + @extend .ml-5; } } diff --git a/app/assets/stylesheets/styles/patient_edit.scss b/app/assets/stylesheets/styles/patient_edit.scss index 43cc7a9d0..6a2b15e4c 100644 --- a/app/assets/stylesheets/styles/patient_edit.scss +++ b/app/assets/stylesheets/styles/patient_edit.scss @@ -1,5 +1,6 @@ // Styling related to the larger patient edit page. +@use 'bootstrap/scss/bootstrap'; @use '_variables'; #patient_dashboard { From af433ea7ba36b01ce9abb8d2abd8a0615921e88d Mon Sep 17 00:00:00 2001 From: colinxfleming Date: Sun, 1 Dec 2024 14:05:20 -0500 Subject: [PATCH 4/9] prefer relative assets --- app/assets/stylesheets/styles/budget_bar.scss | 2 +- app/assets/stylesheets/styles/buttons.scss | 2 +- app/assets/stylesheets/styles/call_list.scss | 2 +- app/assets/stylesheets/styles/calls.scss | 2 +- .../stylesheets/styles/clinic_finder.scss | 2 +- app/assets/stylesheets/styles/devise.scss | 2 +- app/assets/stylesheets/styles/events.scss | 2 +- app/assets/stylesheets/styles/flash.scss | 2 +- app/assets/stylesheets/styles/globals.scss | 4 +- app/assets/stylesheets/styles/navbar.scss | 2 +- app/assets/stylesheets/styles/pagination.scss | 2 +- .../stylesheets/styles/patient_edit.scss | 2 +- .../stylesheets/styles/patient_menu.scss | 2 +- app/assets/stylesheets/styles/tables.scss | 2 +- app/assets/stylesheets/styles/tooltips.scss | 2 +- app/assets/stylesheets/styles/users.scss | 2 +- app/javascript/locales.json | 105 +++++++++--------- 17 files changed, 72 insertions(+), 67 deletions(-) diff --git a/app/assets/stylesheets/styles/budget_bar.scss b/app/assets/stylesheets/styles/budget_bar.scss index 7d27c78dd..8dfb77806 100644 --- a/app/assets/stylesheets/styles/budget_bar.scss +++ b/app/assets/stylesheets/styles/budget_bar.scss @@ -1,6 +1,6 @@ // Styling related to the budget bar utility. -@use '_variables'; +@use './_variables'; $budget-bar-font-size: 14px; diff --git a/app/assets/stylesheets/styles/buttons.scss b/app/assets/stylesheets/styles/buttons.scss index 2949f9a1a..b86fe17a7 100644 --- a/app/assets/stylesheets/styles/buttons.scss +++ b/app/assets/stylesheets/styles/buttons.scss @@ -1,6 +1,6 @@ // Button styling. @use "sass:color"; -@use '_variables'; +@use './_variables'; // btn-primary .btn-primary { diff --git a/app/assets/stylesheets/styles/call_list.scss b/app/assets/stylesheets/styles/call_list.scss index 49702a98b..8305c0a4c 100644 --- a/app/assets/stylesheets/styles/call_list.scss +++ b/app/assets/stylesheets/styles/call_list.scss @@ -1,6 +1,6 @@ // Styling related to the call list and patient search. -@use '_variables'; +@use './_variables'; .call-icon { color: variables.$white; diff --git a/app/assets/stylesheets/styles/calls.scss b/app/assets/stylesheets/styles/calls.scss index deb750df0..c1b8b11c7 100644 --- a/app/assets/stylesheets/styles/calls.scss +++ b/app/assets/stylesheets/styles/calls.scss @@ -1,6 +1,6 @@ // Styling related to log-a-call modals. -@use '_variables'; +@use './_variables'; // Core new call modal .calls-layout { diff --git a/app/assets/stylesheets/styles/clinic_finder.scss b/app/assets/stylesheets/styles/clinic_finder.scss index e961b5889..997d1f690 100644 --- a/app/assets/stylesheets/styles/clinic_finder.scss +++ b/app/assets/stylesheets/styles/clinic_finder.scss @@ -1,6 +1,6 @@ // Styling related to the clinic finder utility. -@use '_variables'; +@use './_variables'; .clinic_finder_container { background-color: variables.$grey-color; diff --git a/app/assets/stylesheets/styles/devise.scss b/app/assets/stylesheets/styles/devise.scss index fe6e8c6a7..cbf370e10 100644 --- a/app/assets/stylesheets/styles/devise.scss +++ b/app/assets/stylesheets/styles/devise.scss @@ -1,7 +1,7 @@ // Styles pertaining to the login form or other devise-related views. @use 'bootstrap/scss/bootstrap'; -@use '_variables'; +@use './_variables'; .authform { @extend .card-header; diff --git a/app/assets/stylesheets/styles/events.scss b/app/assets/stylesheets/styles/events.scss index 7bdebda9c..b08070999 100644 --- a/app/assets/stylesheets/styles/events.scss +++ b/app/assets/stylesheets/styles/events.scss @@ -1,7 +1,7 @@ // Styling for the events log on the patient dashboard. @use 'bootstrap/scss/bootstrap'; -@use '_variables'; +@use './_variables'; svg.event-item { border-radius: 50%; diff --git a/app/assets/stylesheets/styles/flash.scss b/app/assets/stylesheets/styles/flash.scss index ec67301ba..6e354235e 100644 --- a/app/assets/stylesheets/styles/flash.scss +++ b/app/assets/stylesheets/styles/flash.scss @@ -1,7 +1,7 @@ // Styling around flash messages. @use 'bootstrap/scss/bootstrap'; -@use '_variables'; +@use './_variables'; #flash { position: fixed; diff --git a/app/assets/stylesheets/styles/globals.scss b/app/assets/stylesheets/styles/globals.scss index ea6e21a63..e8ed661ad 100644 --- a/app/assets/stylesheets/styles/globals.scss +++ b/app/assets/stylesheets/styles/globals.scss @@ -1,8 +1,8 @@ // Global styling patterns. -@use "_variables"; -@use "vendor/googleapis_source_sans_pro"; @use 'bootstrap/scss/bootstrap'; +@use "vendor/googleapis_source_sans_pro"; +@use "./_variables"; @charset "utf-8"; diff --git a/app/assets/stylesheets/styles/navbar.scss b/app/assets/stylesheets/styles/navbar.scss index c97a63afd..7052ef518 100644 --- a/app/assets/stylesheets/styles/navbar.scss +++ b/app/assets/stylesheets/styles/navbar.scss @@ -1,7 +1,7 @@ // Styling for the navbar. @use "sass:color"; -@use '_variables'; +@use './_variables'; .navbar-inverse{ background-color: variables.$light-gray; diff --git a/app/assets/stylesheets/styles/pagination.scss b/app/assets/stylesheets/styles/pagination.scss index f148a2fca..c3db99406 100644 --- a/app/assets/stylesheets/styles/pagination.scss +++ b/app/assets/stylesheets/styles/pagination.scss @@ -1,6 +1,6 @@ // Styling for Kaminari pagination -@use '_variables'; +@use './_variables'; span.page, span.first, span.prev, span.next, span.last { font-size: variables.$font-size; diff --git a/app/assets/stylesheets/styles/patient_edit.scss b/app/assets/stylesheets/styles/patient_edit.scss index 6a2b15e4c..56a4f19ad 100644 --- a/app/assets/stylesheets/styles/patient_edit.scss +++ b/app/assets/stylesheets/styles/patient_edit.scss @@ -1,7 +1,7 @@ // Styling related to the larger patient edit page. @use 'bootstrap/scss/bootstrap'; -@use '_variables'; +@use './_variables'; #patient_dashboard { border-bottom: 1px solid variables.$black; diff --git a/app/assets/stylesheets/styles/patient_menu.scss b/app/assets/stylesheets/styles/patient_menu.scss index 1e0e686c6..f55644607 100644 --- a/app/assets/stylesheets/styles/patient_menu.scss +++ b/app/assets/stylesheets/styles/patient_menu.scss @@ -1,6 +1,6 @@ // Styling for the patient nav menu. -@use '_variables'; +@use './_variables'; .abortion-left-menu.nav-pills { font-size: variables.$font-size; diff --git a/app/assets/stylesheets/styles/tables.scss b/app/assets/stylesheets/styles/tables.scss index 9e1d97d0c..6ccda5412 100644 --- a/app/assets/stylesheets/styles/tables.scss +++ b/app/assets/stylesheets/styles/tables.scss @@ -1,6 +1,6 @@ // Additional styling for table elements. -@use '_variables'; +@use './_variables'; table.border-side { th { diff --git a/app/assets/stylesheets/styles/tooltips.scss b/app/assets/stylesheets/styles/tooltips.scss index 4b2b41ebc..b6fb954ca 100644 --- a/app/assets/stylesheets/styles/tooltips.scss +++ b/app/assets/stylesheets/styles/tooltips.scss @@ -1,6 +1,6 @@ // Styling around bootstrap tooltips. -@use '_variables'; +@use './_variables'; .tooltip-header-help { color: variables.$grey-color; diff --git a/app/assets/stylesheets/styles/users.scss b/app/assets/stylesheets/styles/users.scss index 71864f940..68a8c5f2f 100644 --- a/app/assets/stylesheets/styles/users.scss +++ b/app/assets/stylesheets/styles/users.scss @@ -1,6 +1,6 @@ // Styling specific to users routes. -@use '_variables'; +@use './_variables'; // Make data-sort elements in user list a pointer. #user-list th[data-sort] { diff --git a/app/javascript/locales.json b/app/javascript/locales.json index d2393a396..c1d58f05b 100644 --- a/app/javascript/locales.json +++ b/app/javascript/locales.json @@ -6629,8 +6629,7 @@ } } }, - "nth": { - }, + "nth": {}, "percentage": { "format": { "delimiter": "", @@ -16600,8 +16599,7 @@ } } }, - "nth": { - }, + "nth": {}, "percentage": { "format": { "delimiter": "", @@ -16884,8 +16882,7 @@ } } }, - "nth": { - }, + "nth": {}, "percentage": { "format": { "delimiter": "", @@ -17168,8 +17165,7 @@ } } }, - "nth": { - }, + "nth": {}, "percentage": { "format": { "delimiter": "", @@ -17452,8 +17448,7 @@ } } }, - "nth": { - }, + "nth": {}, "percentage": { "format": { "delimiter": "", @@ -18048,8 +18043,7 @@ } } }, - "nth": { - }, + "nth": {}, "percentage": { "format": { "delimiter": "", @@ -19130,28 +19124,28 @@ }, "date": { "abbr_day_names": [ - "ned", - "pon", - "uto", - "sri", - "čet", - "pet", - "sub" + "ned.", + "pon.", + "uto.", + "sri.", + "čet.", + "pet.", + "sub." ], "abbr_month_names": [ null, - "sij", - "velj", - "ožu", - "tra", - "svi", - "lip", - "srp", - "kol", - "ruj", - "lis", - "stu", - "pro" + "sij.", + "velj.", + "ožu.", + "tra.", + "svi.", + "lip.", + "srp.", + "kol.", + "ruj.", + "lis.", + "stu.", + "pro." ], "day_names": [ "nedjelja", @@ -19169,18 +19163,18 @@ }, "month_names": [ null, - "siječanj", - "veljača", - "ožujak", - "travanj", - "svibanj", - "lipanj", - "srpanj", - "kolovoz", - "rujan", - "listopad", - "studeni", - "prosinac" + "siječnja", + "veljače", + "ožujka", + "travnja", + "svibnja", + "lipnja", + "srpnja", + "kolovoza", + "rujna", + "listopada", + "studenoga", + "prosinca" ], "order": [ "day", @@ -22429,9 +22423,11 @@ "format": "%n%u", "units": { "byte": "바이트", + "eb": "EB", "gb": "GB", "kb": "KB", "mb": "MB", + "pb": "PB", "tb": "TB" } } @@ -23073,6 +23069,11 @@ "few": "%{count} sekundės", "one": "%{count} sekundė", "other": "%{count} sekundžių" + }, + "x_years": { + "few": "%{count} metai", + "one": "%{count} metai", + "other": "%{count} metai" } }, "prompts": { @@ -23096,15 +23097,18 @@ "exclusion": "yra rezervuotas", "greater_than": "turi būti didesnis už %{count}", "greater_than_or_equal_to": "turi būti didesnis arba lygus %{count}", + "in": "turi būti skaičiuje %{count}", "inclusion": "nenumatyta reikšmė", "invalid": "neteisingas", "less_than": "turi būti mažesnis už %{count}", "less_than_or_equal_to": "turi būti mažesnis arba lygus %{count}", + "model_invalid": "Tikrinimo klaida: %{errors}", "not_a_number": "ne skaičius", "not_an_integer": "privalo būti sveikas skaičius", "odd": "turi būti nelyginis skaičius", "other_than": "privalo būti kitoks nei %{count}", "present": "turi būti tuščias", + "required": "turi egzistuoti", "taken": "jau užimtas", "too_long": { "few": "per ilgas (daugiausiai %{count} simboliai)", @@ -23161,6 +23165,7 @@ "format": { "delimiter": " ", "precision": 3, + "round_mode": "default", "separator": ",", "significant": false, "strip_insignificant_zeros": false @@ -23191,9 +23196,11 @@ "one": "Baitas", "other": "Baitų" }, + "eb": "EB", "gb": "GB", "kb": "KB", "mb": "MB", + "pb": "PB", "tb": "TB" } } @@ -28261,7 +28268,7 @@ "submit": { "create": "Criar %{model}", "submit": "Gravar %{model}", - "update": "Actualizar %{model}" + "update": "Atualizar %{model}" } }, "i18n": { @@ -28304,7 +28311,7 @@ "currency": { "format": { "delimiter": ".", - "format": "%u %n", + "format": "%n %u", "precision": 2, "separator": ",", "significant": false, @@ -29525,8 +29532,7 @@ "other" ] }, - "transliterate": { - } + "transliterate": {} }, "i18n_tasks": { "add_missing": { @@ -33589,7 +33595,7 @@ ], "formats": { "default": "%d.%m.%Y", - "long": "%e %B %Y, %A", + "long": "%e %B %Y %A", "short": "%e %b" }, "month_names": [ @@ -34698,8 +34704,7 @@ "other" ] }, - "transliterate": { - } + "transliterate": {} }, "number": { "currency": { From b975d5625e79708d67c0d808ec2c9a16a47f6181 Mon Sep 17 00:00:00 2001 From: colinxfleming Date: Sun, 1 Dec 2024 14:17:11 -0500 Subject: [PATCH 5/9] fix spacing on dashboard --- app/assets/stylesheets/styles/globals.scss | 1 - app/views/dashboards/_budget_bar.html.erb | 2 +- app/views/dashboards/_table_content.html.erb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/styles/globals.scss b/app/assets/stylesheets/styles/globals.scss index e8ed661ad..488221fbe 100644 --- a/app/assets/stylesheets/styles/globals.scss +++ b/app/assets/stylesheets/styles/globals.scss @@ -11,7 +11,6 @@ html { } body { - font-family: "Source Sans Pro", sans-serif; font-size: variables.$font-size; } diff --git a/app/views/dashboards/_budget_bar.html.erb b/app/views/dashboards/_budget_bar.html.erb index 9925ac882..07fe2d418 100644 --- a/app/views/dashboards/_budget_bar.html.erb +++ b/app/views/dashboards/_budget_bar.html.erb @@ -1,4 +1,4 @@ -
+
<% expenditures.each_pair do |type, patient_hashes| %> <% patient_hashes.each do |patient| %>
diff --git a/app/views/dashboards/_table_content.html.erb b/app/views/dashboards/_table_content.html.erb index 2d74fe4e2..9371ae2cf 100644 --- a/app/views/dashboards/_table_content.html.erb +++ b/app/views/dashboards/_table_content.html.erb @@ -1,6 +1,6 @@ -
+

<%= title %> <%= dashboard_table_content_tooltip_shell table_type %> From 86308c85c334a0971dc85c0b6ca9e939feb59afa Mon Sep 17 00:00:00 2001 From: colinxfleming Date: Sun, 1 Dec 2024 14:37:02 -0500 Subject: [PATCH 6/9] move up spacing rather than having it on every header on patient edit page --- .../patients/_abortion_information.html.erb | 2 +- app/views/patients/_call_log.html.erb | 2 +- app/views/patients/_change_log.html.erb | 2 +- app/views/patients/_menu.html.erb | 2 +- app/views/patients/_notes.html.erb | 2 +- .../patients/_patient_information.html.erb | 2 +- .../patients/_practical_support.html.erb | 2 +- app/views/patients/edit.html.erb | 54 ++++++++++--------- 8 files changed, 36 insertions(+), 32 deletions(-) diff --git a/app/views/patients/_abortion_information.html.erb b/app/views/patients/_abortion_information.html.erb index 536ea91c7..e1e08ee05 100644 --- a/app/views/patients/_abortion_information.html.erb +++ b/app/views/patients/_abortion_information.html.erb @@ -1,5 +1,5 @@
-

<%= t('patient.abortion_information.title') %>

+

<%= t('patient.abortion_information.title') %>

<% if patient.practical_supports.any? %> diff --git a/app/views/patients/_call_log.html.erb b/app/views/patients/_call_log.html.erb index c0d76b7ee..f96101b41 100644 --- a/app/views/patients/_call_log.html.erb +++ b/app/views/patients/_call_log.html.erb @@ -1,5 +1,5 @@
-

+

<%= t('patient.call_log.title') %> <%= link_to t('patient.call_log.record_new_call'), diff --git a/app/views/patients/_change_log.html.erb b/app/views/patients/_change_log.html.erb index 6927039d6..8ae9a0c83 100644 --- a/app/views/patients/_change_log.html.erb +++ b/app/views/patients/_change_log.html.erb @@ -1,5 +1,5 @@
-

<%= t('patient.change_log.title') %>

+

<%= t('patient.change_log.title') %>

diff --git a/app/views/patients/_menu.html.erb b/app/views/patients/_menu.html.erb index 5ecca7d35..e0f3b9d69 100644 --- a/app/views/patients/_menu.html.erb +++ b/app/views/patients/_menu.html.erb @@ -1,4 +1,4 @@ -
+