From 08dc3e3cbe823b19e40eee134679fa00e419551a Mon Sep 17 00:00:00 2001 From: David Cook Date: Tue, 23 May 2023 16:49:58 +1000 Subject: [PATCH] Prettify more admin css yarn prettier --write --- .../css/admin/advanced_settings.scss | 2 +- app/webpacker/css/admin/all.scss | 1 - app/webpacker/css/admin/change_type_form.scss | 20 ++- .../css/admin/components/navigation.scss | 2 +- app/webpacker/css/admin/customers.scss | 2 - app/webpacker/css/admin/dashboard_item.scss | 6 +- app/webpacker/css/admin/disabled.scss | 5 +- .../css/admin/enterprise_index_panels.scss | 35 +++-- .../css/admin/filters_and_controls.scss | 4 +- app/webpacker/css/admin/grid.scss | 124 +++++++++++++----- .../css/admin/index_panel_buttons.scss | 10 +- app/webpacker/css/admin/index_panels.scss | 24 ++-- app/webpacker/css/admin/order_cycles.scss | 9 +- app/webpacker/css/admin/product_import.scss | 44 ++++--- .../css/admin/question-mark-tooltip.scss | 1 - app/webpacker/css/admin/relationships.scss | 6 +- app/webpacker/css/admin/reports.scss | 11 +- app/webpacker/css/admin/sections/orders.scss | 3 +- .../css/admin/sections/products.scss | 5 +- app/webpacker/css/admin/select2.scss | 7 +- app/webpacker/css/admin/sidebar-item.scss | 9 +- app/webpacker/css/admin/tables.scss | 5 +- app/webpacker/css/admin/tag_rules.scss | 11 +- .../css/admin/terms_of_service_files.scss | 4 +- app/webpacker/css/admin/welcome.scss | 3 +- 25 files changed, 233 insertions(+), 120 deletions(-) diff --git a/app/webpacker/css/admin/advanced_settings.scss b/app/webpacker/css/admin/advanced_settings.scss index 6636428f3b..c28c7ce3b4 100644 --- a/app/webpacker/css/admin/advanced_settings.scss +++ b/app/webpacker/css/admin/advanced_settings.scss @@ -8,7 +8,7 @@ #toggle_settings { display: flex; align-items: center; - + i { display: inline-flex; margin-left: 5px; diff --git a/app/webpacker/css/admin/all.scss b/app/webpacker/css/admin/all.scss index 7512a443c3..ea19d92b46 100644 --- a/app/webpacker/css/admin/all.scss +++ b/app/webpacker/css/admin/all.scss @@ -130,5 +130,4 @@ @import "app/components/table_header_component/table_header_component"; @import "app/components/search_input_component/search_input_component"; @import "app/components/confirm_modal_component/confirm_modal_component"; - @import "app/webpacker/css/admin/trix.scss"; diff --git a/app/webpacker/css/admin/change_type_form.scss b/app/webpacker/css/admin/change_type_form.scss index 87b43ff1a2..080a46b63b 100644 --- a/app/webpacker/css/admin/change_type_form.scss +++ b/app/webpacker/css/admin/change_type_form.scss @@ -5,7 +5,8 @@ section { margin: 2em 0 0 0; - &, & * { + &, + & * { color: $spree-blue; } } @@ -48,11 +49,13 @@ width: 100%; cursor: pointer; - &, & * { + &, + & * { color: white; } - &:after, &:before { + &:after, + &:before { top: 100%; left: 50%; border: solid transparent; @@ -84,7 +87,13 @@ } .bottom { - background: repeating-linear-gradient(60deg, rgba(84, 152, 218, 0), rgba(84, 152, 218, 0) 5px, rgba(255, 255, 255, 0.25) 5px, rgba(255, 255, 255, 0.25) 10px); + background: repeating-linear-gradient( + 60deg, + rgba(84, 152, 218, 0), + rgba(84, 152, 218, 0) 5px, + rgba(255, 255, 255, 0.25) 5px, + rgba(255, 255, 255, 0.25) 10px + ); margin-top: 1em; margin-left: -15px; margin-right: -15px; @@ -95,7 +104,8 @@ &.selected { background-color: black; - &:after, &:hover &:after { + &:after, + &:hover &:after { border-top-color: black; } } diff --git a/app/webpacker/css/admin/components/navigation.scss b/app/webpacker/css/admin/components/navigation.scss index b6fb372546..2aeb3a8a30 100644 --- a/app/webpacker/css/admin/components/navigation.scss +++ b/app/webpacker/css/admin/components/navigation.scss @@ -78,7 +78,7 @@ nav.menu { text-transform: uppercase; position: relative; text-align: center; - font-weight: 600; + font-weight: 600; i { display: inline; diff --git a/app/webpacker/css/admin/customers.scss b/app/webpacker/css/admin/customers.scss index f1284b4725..920a3a60db 100644 --- a/app/webpacker/css/admin/customers.scss +++ b/app/webpacker/css/admin/customers.scss @@ -3,9 +3,7 @@ } table#customers.index { - tr.customer { - .guest-label { color: $medium-grey; display: block; diff --git a/app/webpacker/css/admin/dashboard_item.scss b/app/webpacker/css/admin/dashboard_item.scss index 829b98590f..6a758a29e3 100644 --- a/app/webpacker/css/admin/dashboard_item.scss +++ b/app/webpacker/css/admin/dashboard_item.scss @@ -165,7 +165,8 @@ div.dashboard_item { border: solid $warning-red; } - &.orange, &.red { + &.orange, + &.red { border-width: 0px 3px 0px 3px; } @@ -177,7 +178,8 @@ div.dashboard_item { background-color: $spree-light-blue; } - &.even, &.odd { + &.even, + &.odd { &:hover { color: #ffffff; background-color: $spree-green; diff --git a/app/webpacker/css/admin/disabled.scss b/app/webpacker/css/admin/disabled.scss index b454754f2a..14cbcc1714 100644 --- a/app/webpacker/css/admin/disabled.scss +++ b/app/webpacker/css/admin/disabled.scss @@ -5,7 +5,8 @@ label.disabled { pointer-events: none; } -input[type='button'], input[type='submit'] { +input[type="button"], +input[type="submit"] { &:disabled { background-color: $disabled-background; color: #ffffff; @@ -14,7 +15,7 @@ input[type='button'], input[type='submit'] { &.secondary:disabled { background-color: #ebf3fb; border: 1px solid #ebf3fb; - color: #AFCFEF; + color: #afcfef; } } diff --git a/app/webpacker/css/admin/enterprise_index_panels.scss b/app/webpacker/css/admin/enterprise_index_panels.scss index 7d95b9b8e2..2a5aac968f 100644 --- a/app/webpacker/css/admin/enterprise_index_panels.scss +++ b/app/webpacker/css/admin/enterprise_index_panels.scss @@ -1,4 +1,5 @@ -.enterprise_package_panel, .enterprise_producer_panel { +.enterprise_package_panel, +.enterprise_producer_panel { .info { p { font-size: 1rem; @@ -14,7 +15,8 @@ text-align: center; // width: 100%; cursor: pointer; - &, & * { + &, + & * { color: white; } &:hover { @@ -22,11 +24,17 @@ border-top-color: $spree-green; } } - &.disabled{ - background-color: #C1C1C1; + &.disabled { + background-color: #c1c1c1; } .bottom { - background: repeating-linear-gradient(60deg, rgba(84, 152, 218, 0), rgba(84, 152, 218, 0) 5px, rgba(255, 255, 255, 0.25) 5px, rgba(255, 255, 255, 0.25) 10px); + background: repeating-linear-gradient( + 60deg, + rgba(84, 152, 218, 0), + rgba(84, 152, 218, 0) 5px, + rgba(255, 255, 255, 0.25) 5px, + rgba(255, 255, 255, 0.25) 10px + ); margin-top: 1em; margin-left: -15px; margin-right: -15px; @@ -47,8 +55,8 @@ pointer-events: none; border-top: 20px solid transparent; - border-bottom: 20px solid transparent; - border-right: 20px solid #000000; + border-bottom: 20px solid transparent; + border-right: 20px solid #000000; margin-top: -20px; margin-left: -20px; } @@ -65,7 +73,7 @@ } } - td.description{ + td.description { font-size: 0.9rem; } @@ -75,18 +83,18 @@ i { font-size: 1.5rem; - &.issue{ + &.issue { color: $warning-red; } - &.warning{ + &.warning { color: #ff9848; } } } } -tags-input .tags li.tag-item { +tags-input .tags li.tag-item { -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; @@ -106,6 +114,7 @@ tags-input .tags .tag-item .remove-button { color: white; } -table th.actions .no-text[class*="icon-"], table td.actions .no-text[class*="icon-"] { +table th.actions .no-text[class*="icon-"], +table td.actions .no-text[class*="icon-"] { cursor: pointer; -} \ No newline at end of file +} diff --git a/app/webpacker/css/admin/filters_and_controls.scss b/app/webpacker/css/admin/filters_and_controls.scss index 8dd188d9cd..146e6afb1d 100644 --- a/app/webpacker/css/admin/filters_and_controls.scss +++ b/app/webpacker/css/admin/filters_and_controls.scss @@ -1,3 +1,5 @@ -.filters, .controls, .divider { +.filters, +.controls, +.divider { margin-bottom: 15px; } diff --git a/app/webpacker/css/admin/grid.scss b/app/webpacker/css/admin/grid.scss index e5b37ce15b..af615768ea 100644 --- a/app/webpacker/css/admin/grid.scss +++ b/app/webpacker/css/admin/grid.scss @@ -64,68 +64,130 @@ $col-16: 100; } .column.one, -.columns.one { width: percentage($col-1); } +.columns.one { + width: percentage($col-1); +} -.columns.two { width: percentage($col-2); } +.columns.two { + width: percentage($col-2); +} -.columns.three { width: percentage($col-3); } +.columns.three { + width: percentage($col-3); +} -.columns.four { width: percentage($col-4); } +.columns.four { + width: percentage($col-4); +} -.columns.five { width: percentage($col-5); } +.columns.five { + width: percentage($col-5); +} -.columns.six { width: percentage($col-6); } +.columns.six { + width: percentage($col-6); +} -.columns.seven { width: percentage($col-7); } +.columns.seven { + width: percentage($col-7); +} -.columns.eight { width: percentage($col-8); } +.columns.eight { + width: percentage($col-8); +} -.columns.nine { width: percentage($col-9); } +.columns.nine { + width: percentage($col-9); +} -.columns.ten { width: percentage($col-10); } +.columns.ten { + width: percentage($col-10); +} -.columns.eleven { width: percentage($col-11); } +.columns.eleven { + width: percentage($col-11); +} -.columns.twelve { width: percentage($col-12); } +.columns.twelve { + width: percentage($col-12); +} -.columns.thirteen { width: percentage($col-13); } +.columns.thirteen { + width: percentage($col-13); +} -.columns.fourteen { width: percentage($col-14);} +.columns.fourteen { + width: percentage($col-14); +} -.columns.fifteen { width: percentage($col-15); } +.columns.fifteen { + width: percentage($col-15); +} -.columns.sixteen { width: 100%; } +.columns.sixteen { + width: 100%; +} .column.offset-by-one, -.columns.offset-by-one { margin-left: $col-2; } +.columns.offset-by-one { + margin-left: $col-2; +} -.columns.offset-by-two { margin-left: $col-3; } +.columns.offset-by-two { + margin-left: $col-3; +} -.columns.offset-by-three { margin-left: $col-4; } +.columns.offset-by-three { + margin-left: $col-4; +} -.columns.offset-by-four { margin-left: $col-5; } +.columns.offset-by-four { + margin-left: $col-5; +} -.columns.offset-by-five { margin-left: $col-6; } +.columns.offset-by-five { + margin-left: $col-6; +} -.columns.offset-by-six { margin-left: $col-7; } +.columns.offset-by-six { + margin-left: $col-7; +} -.columns.offset-by-seven { margin-left: $col-8; } +.columns.offset-by-seven { + margin-left: $col-8; +} -.columns.offset-by-eight { margin-left: $col-9; } +.columns.offset-by-eight { + margin-left: $col-9; +} -.columns.offset-by-nine { margin-left: $col-10; } +.columns.offset-by-nine { + margin-left: $col-10; +} -.columns.offset-by-ten { margin-left: $col-11; } +.columns.offset-by-ten { + margin-left: $col-11; +} -.columns.offset-by-eleven { margin-left: $col-12; } +.columns.offset-by-eleven { + margin-left: $col-12; +} -.columns.offset-by-twelve { margin-left: $col-13; } +.columns.offset-by-twelve { + margin-left: $col-13; +} -.columns.offset-by-thirteen { margin-left: $col-14; } +.columns.offset-by-thirteen { + margin-left: $col-14; +} -.columns.offset-by-fourteen { margin-left: $col-15; } +.columns.offset-by-fourteen { + margin-left: $col-15; +} -.columns.offset-by-fifteen { margin-left: 100%; } +.columns.offset-by-fifteen { + margin-left: 100%; +} .column.alpha, .columns.alpha, diff --git a/app/webpacker/css/admin/index_panel_buttons.scss b/app/webpacker/css/admin/index_panel_buttons.scss index 09f7a6f65f..bfaa68e9e9 100644 --- a/app/webpacker/css/admin/index_panel_buttons.scss +++ b/app/webpacker/css/admin/index_panel_buttons.scss @@ -8,20 +8,20 @@ tbody.panel-ctrl { font-size: 1.3rem; background-color: $warning-red; &:hover { - background-color: #CD4E4F; + background-color: #cd4e4f; } &.disabled { - background-color: #C1C1C1; + background-color: #c1c1c1; } &.saving { - background-color: #FF9848; + background-color: #ff9848; i.icon-refresh { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } } - span{ - i{ + span { + i { font-size: 1.5rem; margin-left: 10px; } diff --git a/app/webpacker/css/admin/index_panels.scss b/app/webpacker/css/admin/index_panels.scss index e20ee34a5f..a7e01066f8 100644 --- a/app/webpacker/css/admin/index_panels.scss +++ b/app/webpacker/css/admin/index_panels.scss @@ -1,5 +1,5 @@ tbody.panel-ctrl { - td.panel-toggle{ + td.panel-toggle { -webkit-touch-callout: none; -webkit-user-select: none; -khtml-user-select: none; @@ -60,14 +60,14 @@ tbody.panel-ctrl { } i.icon-status::before { - opacity: 1.0; + opacity: 1; } } } - &.expanded{ - >tr:not(.panel-row) { - >td { + &.expanded { + > tr:not(.panel-row) { + > td { border-bottom: 1px solid #6788a2; &.selected { @@ -86,7 +86,7 @@ tbody.panel-ctrl { } i.icon-status::before { - opacity: 1.0; + opacity: 1; } i.icon-chevron::before { @@ -99,12 +99,12 @@ tbody.panel-ctrl { tr.panel-row { &:hover { - >td { + > td { background-color: #ffffff; } } - >td { + > td { border-color: #6788a2; padding: 0; .panel { @@ -114,16 +114,18 @@ tbody.panel-ctrl { } } - .row{ + .row { margin: 0px -4px; padding: 20px 0px; - .column.alpha, .columns.alpha { + .column.alpha, + .columns.alpha { padding-left: 20px; } - .column.omega, .columns.omega { + .column.omega, + .columns.omega { padding-right: 20px; } } diff --git a/app/webpacker/css/admin/order_cycles.scss b/app/webpacker/css/admin/order_cycles.scss index 012f2513c5..ea73266fb8 100644 --- a/app/webpacker/css/admin/order_cycles.scss +++ b/app/webpacker/css/admin/order_cycles.scss @@ -8,14 +8,16 @@ form.order_cycle { tr { &:hover { - td { background: none; } + td { + background: none; + } } td { border: none; } - #add-remove-buttons{ + #add-remove-buttons { width: 10%; height: 200px; max-height: 300px; @@ -28,7 +30,8 @@ form.order_cycle { font-size: 1em; } } - #available-order-cycles, #selected-order-cycles { + #available-order-cycles, + #selected-order-cycles { text-align: left; width: 40%; height: 200px; diff --git a/app/webpacker/css/admin/product_import.scss b/app/webpacker/css/admin/product_import.scss index db5f8b52d6..49f220edf7 100644 --- a/app/webpacker/css/admin/product_import.scss +++ b/app/webpacker/css/admin/product_import.scss @@ -57,7 +57,6 @@ div.panel-section { div.header-description { width: auto; } - } div.panel-header:hover { @@ -67,7 +66,7 @@ div.panel-section { div.panel-header.active { background-color: #efefef; - text-shadow: 1px 1px 0px rgba(255,255,255,0.75); + text-shadow: 1px 1px 0px rgba(255, 255, 255, 0.75); } div.panel-content { @@ -87,13 +86,14 @@ div.panel-section { table { background-color: white; margin-bottom: 0; - td, th { + td, + th { white-space: nowrap; } tr { &.error { - color: #c84C4c; + color: #c84c4c; } &:hover td.invalid { @@ -137,7 +137,6 @@ br.panels.clearfix { } .panel-section.import-settings { - .header-description { padding-left: 1em; } @@ -189,18 +188,21 @@ br.panels.clearfix { } } -form.product-import, div.post-save-results, div.import-wrapper { +form.product-import, +div.post-save-results, +div.import-wrapper { input[type="submit"] { margin-right: 0.5em; } - input[type="submit"], button, a.button { + input[type="submit"], + button, + a.button { min-width: 8em; text-align: center; } } div.import-wrapper { - .alert-box { margin: 0 0 1.75em; } @@ -215,17 +217,20 @@ div.import-wrapper { left: -9999px; } - .ng-hide-add, .ng-hide-remove, .ng-hide-animate { - transition: all .4s ease-in-out; + .ng-hide-add, + .ng-hide-remove, + .ng-hide-animate { + transition: all 0.4s ease-in-out; } - form.product-import, div.save-results { - transition: all .4s ease-in-out; + form.product-import, + div.save-results { + transition: all 0.4s ease-in-out; } div.progress-interface { text-align: center; - transition: all .4s ease-in-out; + transition: all 0.4s ease-in-out; button:disabled { background: #ccc !important; @@ -233,7 +238,7 @@ div.import-wrapper { } .post-save-results { - a.button{ + a.button { float: left; margin-right: 0.5em; } @@ -250,13 +255,13 @@ div.progress-bar { border-radius: 0.3em; border: 1px solid #eee; - span.progress-track{ + span.progress-track { display: block; background: lighten($pi-green, 10%); height: 100%; border-radius: 0.3em; - box-shadow: inset 0 0 3px rgba(0,0,0,0.3); - transition: width .3s ease-in-out; + box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3); + transition: width 0.3s ease-in-out; } } @@ -267,7 +272,10 @@ div.progress-bar { width: 50%; padding: 0 1.5em 1.5em; - h4, h5, h6, p { + h4, + h5, + h6, + p { margin: 1.25em 0 1em; } diff --git a/app/webpacker/css/admin/question-mark-tooltip.scss b/app/webpacker/css/admin/question-mark-tooltip.scss index 8247a5b5b8..815cd04951 100644 --- a/app/webpacker/css/admin/question-mark-tooltip.scss +++ b/app/webpacker/css/admin/question-mark-tooltip.scss @@ -15,4 +15,3 @@ width: 0; } } - diff --git a/app/webpacker/css/admin/relationships.scss b/app/webpacker/css/admin/relationships.scss index 103da85e47..b0a14ece9b 100644 --- a/app/webpacker/css/admin/relationships.scss +++ b/app/webpacker/css/admin/relationships.scss @@ -9,12 +9,14 @@ } } -table#enterprise-relationships, table#enterprise-roles { +table#enterprise-relationships, +table#enterprise-roles { ul { list-style-type: none; } - th.actions, td.actions { + th.actions, + td.actions { width: 16%; .errors { diff --git a/app/webpacker/css/admin/reports.scss b/app/webpacker/css/admin/reports.scss index d51d54204b..743c8ef4d2 100644 --- a/app/webpacker/css/admin/reports.scss +++ b/app/webpacker/css/admin/reports.scss @@ -2,7 +2,8 @@ table.report__table { margin-top: 1em; @media print { margin: 0; - td, th { + td, + th { border-left: none; border-right: none; } @@ -13,7 +14,9 @@ table.report__table { } .header-row { - &.h1, &.h2, &.h3 { + &.h1, + &.h2, + &.h3 { font-weight: bold; margin-top: 8px; } @@ -45,8 +48,8 @@ table.report__table { } .report__message { border: 1px solid $pale-blue; - border-radius: .5em; - padding: .5em; + border-radius: 0.5em; + padding: 0.5em; text-align: center; flex-grow: 1; } diff --git a/app/webpacker/css/admin/sections/orders.scss b/app/webpacker/css/admin/sections/orders.scss index 2ad582b939..f6b4a4546e 100644 --- a/app/webpacker/css/admin/sections/orders.scss +++ b/app/webpacker/css/admin/sections/orders.scss @@ -51,7 +51,8 @@ .field { margin-bottom: 0; - input[type="text"], input[type="number"] { + input[type="text"], + input[type="number"] { width: 100%; } } diff --git a/app/webpacker/css/admin/sections/products.scss b/app/webpacker/css/admin/sections/products.scss index 2a40157555..bac5965d4e 100644 --- a/app/webpacker/css/admin/sections/products.scss +++ b/app/webpacker/css/admin/sections/products.scss @@ -2,7 +2,10 @@ label { display: inline-block; } - input, select, textarea, .select2-container { + input, + select, + textarea, + .select2-container { width: 100%; } } diff --git a/app/webpacker/css/admin/select2.scss b/app/webpacker/css/admin/select2.scss index 63995bc85c..f076e28335 100644 --- a/app/webpacker/css/admin/select2.scss +++ b/app/webpacker/css/admin/select2.scss @@ -12,15 +12,16 @@ } &.light { - .select2-choice{ + .select2-choice { background-color: #ffffff; font-weight: normal; color: $spree-blue !important; border: 1px solid $color-border !important; } - &:hover, &.select2-container-active { - .select2-choice{ + &:hover, + &.select2-container-active { + .select2-choice { background-color: #ffffff !important; border: 1px solid $spree-green !important; diff --git a/app/webpacker/css/admin/sidebar-item.scss b/app/webpacker/css/admin/sidebar-item.scss index b9d34b27f1..c0aec809e5 100644 --- a/app/webpacker/css/admin/sidebar-item.scss +++ b/app/webpacker/css/admin/sidebar-item.scss @@ -32,7 +32,8 @@ div.sidebar_item { border: solid $warning-red; border-width: 0px 3px 0px 3px; - a.alpha, span.alpha { + a.alpha, + span.alpha { margin-left: -3px; } @@ -60,7 +61,8 @@ div.sidebar_item { border: solid $spree-blue; border-width: 0px 1px 0px 1px; - a.alpha, span.alpha { + a.alpha, + span.alpha { font-weight: bold; margin-left: -1px; padding: 10px 2px 10px 5%; @@ -87,7 +89,8 @@ div.sidebar_item { background-color: $spree-light-blue; } - &.even, &.odd { + &.even, + &.odd { &:hover { color: #ffffff; background-color: $spree-green; diff --git a/app/webpacker/css/admin/tables.scss b/app/webpacker/css/admin/tables.scss index c5f9d64175..5fcad50d5e 100644 --- a/app/webpacker/css/admin/tables.scss +++ b/app/webpacker/css/admin/tables.scss @@ -2,12 +2,13 @@ table tbody tr:hover td { background-color: inherit; } -table tbody tr:hover >td { +table tbody tr:hover > td { background-color: #e9f3fc; } table.layout { - tr, tr:hover { + tr, + tr:hover { td { background-color: transparent; } diff --git a/app/webpacker/css/admin/tag_rules.scss b/app/webpacker/css/admin/tag_rules.scss index 8650f11c22..9050008b82 100644 --- a/app/webpacker/css/admin/tag_rules.scss +++ b/app/webpacker/css/admin/tag_rules.scss @@ -1,6 +1,7 @@ tags-input { &.limit-reached { - input, span.input { + input, + span.input { display: none; } } @@ -19,7 +20,8 @@ tags-input { } } -.customer_tag, .default_rules { +.customer_tag, +.default_rules { background-color: #ffffff; border: 1px solid $pale-blue; margin-bottom: 40px; @@ -86,8 +88,9 @@ tags-input { } } -#new-tag-rule-dialog{ - .select2-chosen, .select2-result-label{ +#new-tag-rule-dialog { + .select2-chosen, + .select2-result-label { font-size: 1rem; font-weight: lighter; } diff --git a/app/webpacker/css/admin/terms_of_service_files.scss b/app/webpacker/css/admin/terms_of_service_files.scss index 0e19930184..8bdebd9956 100644 --- a/app/webpacker/css/admin/terms_of_service_files.scss +++ b/app/webpacker/css/admin/terms_of_service_files.scss @@ -1,6 +1,6 @@ .admin-current-terms-of-service { - border: .1em solid $spree-blue; - border-radius: .5em; + border: 0.1em solid $spree-blue; + border-radius: 0.5em; margin: 1em 0; padding: 1em; } diff --git a/app/webpacker/css/admin/welcome.scss b/app/webpacker/css/admin/welcome.scss index eac98dd5a5..9f58728823 100644 --- a/app/webpacker/css/admin/welcome.scss +++ b/app/webpacker/css/admin/welcome.scss @@ -17,7 +17,8 @@ font-weight: 300; } - &, & * { + &, + & * { color: white; } }