From e34f4a99710aca8b84af327c380d240cc9eab3ae Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 10:35:37 +0200 Subject: [PATCH 01/17] AdminV3: Remove icon from icon from primary navigation menu Co-Authored-By: Maikel --- app/helpers/spree/admin/navigation_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/spree/admin/navigation_helper.rb b/app/helpers/spree/admin/navigation_helper.rb index 56fc759660..b182b3fbae 100644 --- a/app/helpers/spree/admin/navigation_helper.rb +++ b/app/helpers/spree/admin/navigation_helper.rb @@ -30,7 +30,7 @@ module Spree css_classes = [] - if options[:icon] + if options[:icon] && !feature?(:admin_style_v3, spree_current_user) link = link_to_with_icon(options[:icon], titleized_label, destination_url) css_classes << 'tab-with-icon' else From eab46b67e3b5fe84b57592d302822270cd7018f4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 10:45:24 +0200 Subject: [PATCH 02/17] Copy/Paste file `admin/components/navigation` under `admin_v3` folder + prettier --- app/webpacker/css/admin_v3/all.scss | 2 +- .../css/admin_v3/components/navigation.scss | 174 ++++++++++++++++++ 2 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 app/webpacker/css/admin_v3/components/navigation.scss diff --git a/app/webpacker/css/admin_v3/all.scss b/app/webpacker/css/admin_v3/all.scss index 72c5c4260c..b00611099d 100644 --- a/app/webpacker/css/admin_v3/all.scss +++ b/app/webpacker/css/admin_v3/all.scss @@ -56,7 +56,7 @@ @import "../admin/components/input"; @import "../admin/components/jquery_dialog"; @import "../admin/components/messages"; -@import "../admin/components/navigation"; +@import "components/navigation"; // admin_v3 @import "../admin/components/ng-cloak"; @import "../admin/components/page_actions"; @import "../admin/components/pagination"; diff --git a/app/webpacker/css/admin_v3/components/navigation.scss b/app/webpacker/css/admin_v3/components/navigation.scss new file mode 100644 index 0000000000..2aeb3a8a30 --- /dev/null +++ b/app/webpacker/css/admin_v3/components/navigation.scss @@ -0,0 +1,174 @@ +// Navigation +//--------------------------------------------------- +.inline-menu { + margin: 0; + -webkit-margin-before: 0; + -webkit-padding-start: 0; +} + +nav.menu { + ul { + list-style: none; + + li { + a { + padding: 10px 0; + display: block; + position: relative; + text-align: left; + border: 1px solid transparent; + text-transform: uppercase; + font-weight: 600; + font-size: 90%; + } + + &.active a { + color: $color-2; + border-left-width: 0; + border-bottom-color: $color-2; + } + + &:hover a { + color: $color-2; + } + } + } +} + +.admin-login-navigation-bar { + ul { + text-align: right; + + li { + padding: 5px 0 5px 10px; + text-align: right; + font-size: 90%; + color: $color-link; + margin-top: 8px; + + &.user-logged-in-as { + width: 50%; + color: $color-body-text; + } + + &:hover { + i { + color: $color-2; + } + } + } + } +} + +#admin-menu { + background-color: $color-3; + + ul { + display: flex; + } + + li { + min-width: 90px; + flex-grow: 1; + + a { + display: block; + padding: 25px 5px; + color: $color-1 !important; + text-transform: uppercase; + position: relative; + text-align: center; + font-weight: 600; + + i { + display: inline; + } + + &:hover { + background-color: $color-2; + + &:after { + content: ""; + position: absolute; + border-left: 10px solid transparent; + border-right: 10px solid transparent; + border-top: 5px solid $color-2; + bottom: 0px; + margin-bottom: -5px; + left: 50%; + margin-left: -10px; + z-index: 1; + } + } + + span.text { + font-weight: 600; + } + } + + a::before { + font-weight: normal; + padding-top: 0; + } + + .dropdown { + width: 300px; + background-color: $color-3; + width: 200px; + z-index: 100000; + + > li { + width: 200px !important; + + a:after { + display: none; + } + } + } + + &.selected a { + @extend a, :hover; + } + } +} + +#sub-menu { + background-color: $color-2; + padding-bottom: 0; + + li { + a { + display: block; + padding: 12px 20px; + color: $color-1; + text-align: center; + text-transform: uppercase; + position: relative; + font-size: 85%; + } + + &.selected a, + a:hover { + &:after { + content: ""; + position: absolute; + border-left: 10px solid transparent; + border-right: 10px solid transparent; + border-top: 5px solid $color-2; + bottom: 0px; + margin-bottom: -5px; + left: 50%; + margin-left: -10px; + z-index: 0; + } + } + } +} + +#header figure { + margin: 0.25em 0; +} + +#login-nav { + line-height: 1.75em; +} From 5ee3550ebd99f10d1acbf3a0c56ba73f4bf34f72 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 10:49:06 +0200 Subject: [PATCH 03/17] Change case to Sentence case CSS property `capitalize` uppercase all first letter of each words. I need to use a small trick with `::first-letter` selector --- app/webpacker/css/admin_v3/components/navigation.scss | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/webpacker/css/admin_v3/components/navigation.scss b/app/webpacker/css/admin_v3/components/navigation.scss index 2aeb3a8a30..a7dc2fec5c 100644 --- a/app/webpacker/css/admin_v3/components/navigation.scss +++ b/app/webpacker/css/admin_v3/components/navigation.scss @@ -75,7 +75,10 @@ nav.menu { display: block; padding: 25px 5px; color: $color-1 !important; - text-transform: uppercase; + text-transform: lowercase; + &::first-letter { + text-transform: uppercase; + } position: relative; text-align: center; font-weight: 600; @@ -142,7 +145,10 @@ nav.menu { padding: 12px 20px; color: $color-1; text-align: center; - text-transform: uppercase; + text-transform: lowercase; + &::first-letter { + text-transform: uppercase; + } position: relative; font-size: 85%; } From dd4809272876da0f99625c10d9818260c29d2703 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 14:46:22 +0200 Subject: [PATCH 04/17] Prettier file --- app/webpacker/css/admin_v3/globals/palette.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/webpacker/css/admin_v3/globals/palette.scss b/app/webpacker/css/admin_v3/globals/palette.scss index a22e4a985b..6b5ad092db 100644 --- a/app/webpacker/css/admin_v3/globals/palette.scss +++ b/app/webpacker/css/admin_v3/globals/palette.scss @@ -1,7 +1,7 @@ // Basic color palette for admin styles v3 -$color-1: #FFFFFF !default; // White -$color-2: #9FC820 !default; // Green -$color-3: #008397 !default; // Teal (Allports) -$color-4: #6788A2 !default; // Dark Blue -$color-5: #C85136 !default; // Red/Orange (Mojo) -$color-6: #FF9300 !default; // Yellow +$color-1: #ffffff !default; // White +$color-2: #9fc820 !default; // Green +$color-3: #008397 !default; // Teal (Allports) +$color-4: #6788a2 !default; // Dark Blue +$color-5: #c85136 !default; // Red/Orange (Mojo) +$color-6: #ff9300 !default; // Yellow From a4d3011e27816d137e1f005f08afc305428667a9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 14:46:28 +0200 Subject: [PATCH 05/17] Add new color: `$color-9 #2E3132 Dark Grey` --- app/webpacker/css/admin_v3/globals/palette.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/webpacker/css/admin_v3/globals/palette.scss b/app/webpacker/css/admin_v3/globals/palette.scss index 6b5ad092db..44138ac8a7 100644 --- a/app/webpacker/css/admin_v3/globals/palette.scss +++ b/app/webpacker/css/admin_v3/globals/palette.scss @@ -5,3 +5,4 @@ $color-3: #008397 !default; // Teal (Allports) $color-4: #6788a2 !default; // Dark Blue $color-5: #c85136 !default; // Red/Orange (Mojo) $color-6: #ff9300 !default; // Yellow +$color-9: #2e3132 !default; // Dark Grey From b163d4a58482a1e04895b853fb4129178eb6d86a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 14:51:04 +0200 Subject: [PATCH 06/17] Remove background-color on menu --- app/webpacker/css/admin_v3/components/navigation.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/webpacker/css/admin_v3/components/navigation.scss b/app/webpacker/css/admin_v3/components/navigation.scss index a7dc2fec5c..340f795cb1 100644 --- a/app/webpacker/css/admin_v3/components/navigation.scss +++ b/app/webpacker/css/admin_v3/components/navigation.scss @@ -61,8 +61,6 @@ nav.menu { } #admin-menu { - background-color: $color-3; - ul { display: flex; } @@ -88,8 +86,6 @@ nav.menu { } &:hover { - background-color: $color-2; - &:after { content: ""; position: absolute; @@ -136,7 +132,6 @@ nav.menu { } #sub-menu { - background-color: $color-2; padding-bottom: 0; li { From ccd7466ede6d7e4297a1652fc4f45bd340e33a36 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 14:51:52 +0200 Subject: [PATCH 07/17] No more white on labels but dark grey --- app/webpacker/css/admin_v3/components/navigation.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/webpacker/css/admin_v3/components/navigation.scss b/app/webpacker/css/admin_v3/components/navigation.scss index 340f795cb1..ee7c3dc549 100644 --- a/app/webpacker/css/admin_v3/components/navigation.scss +++ b/app/webpacker/css/admin_v3/components/navigation.scss @@ -72,7 +72,7 @@ nav.menu { a { display: block; padding: 25px 5px; - color: $color-1 !important; + color: $color-9 !important; text-transform: lowercase; &::first-letter { text-transform: uppercase; @@ -138,7 +138,7 @@ nav.menu { a { display: block; padding: 12px 20px; - color: $color-1; + color: $color-9; text-align: center; text-transform: lowercase; &::first-letter { From d51786ac9e556487e6f98ce948e94d1445391b4c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 14:53:17 +0200 Subject: [PATCH 08/17] Adjust font size for labels in menu --- app/webpacker/css/admin_v3/components/navigation.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/webpacker/css/admin_v3/components/navigation.scss b/app/webpacker/css/admin_v3/components/navigation.scss index ee7c3dc549..6fad77036d 100644 --- a/app/webpacker/css/admin_v3/components/navigation.scss +++ b/app/webpacker/css/admin_v3/components/navigation.scss @@ -19,7 +19,7 @@ nav.menu { border: 1px solid transparent; text-transform: uppercase; font-weight: 600; - font-size: 90%; + font-size: 16px; } &.active a { @@ -80,6 +80,7 @@ nav.menu { position: relative; text-align: center; font-weight: 600; + font-size: 16px; i { display: inline; @@ -145,7 +146,7 @@ nav.menu { text-transform: uppercase; } position: relative; - font-size: 85%; + font-size: 14px; } &.selected a, From ba98039e954c4b48de8f09646fd226c02f54ab5d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 16:05:41 +0200 Subject: [PATCH 09/17] Adjust color to orange when selected or hover --- app/webpacker/css/admin_v3/components/navigation.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/webpacker/css/admin_v3/components/navigation.scss b/app/webpacker/css/admin_v3/components/navigation.scss index 6fad77036d..7a7e40c2de 100644 --- a/app/webpacker/css/admin_v3/components/navigation.scss +++ b/app/webpacker/css/admin_v3/components/navigation.scss @@ -87,6 +87,7 @@ nav.menu { } &:hover { + color: $color-5 !important; &:after { content: ""; position: absolute; @@ -151,6 +152,7 @@ nav.menu { &.selected a, a:hover { + color: $color-5; &:after { content: ""; position: absolute; From 2057449dacdfb2df4ac0142c892080d6c6ea0e2a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 16:12:37 +0200 Subject: [PATCH 10/17] Add new color: `$color-7 #EFF1F2 Light grey` --- app/webpacker/css/admin_v3/globals/palette.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/webpacker/css/admin_v3/globals/palette.scss b/app/webpacker/css/admin_v3/globals/palette.scss index 44138ac8a7..ad1c36bffd 100644 --- a/app/webpacker/css/admin_v3/globals/palette.scss +++ b/app/webpacker/css/admin_v3/globals/palette.scss @@ -5,4 +5,5 @@ $color-3: #008397 !default; // Teal (Allports) $color-4: #6788a2 !default; // Dark Blue $color-5: #c85136 !default; // Red/Orange (Mojo) $color-6: #ff9300 !default; // Yellow +$color-7: #eff1f2 !default; // Light grey $color-9: #2e3132 !default; // Dark Grey From 1b4236640da358010111fd48cadd649fc8c2759b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 16:12:58 +0200 Subject: [PATCH 11/17] Add border with box-shadow to menu and sub-menu --- app/webpacker/css/admin_v3/components/navigation.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/webpacker/css/admin_v3/components/navigation.scss b/app/webpacker/css/admin_v3/components/navigation.scss index 7a7e40c2de..7846c41fcb 100644 --- a/app/webpacker/css/admin_v3/components/navigation.scss +++ b/app/webpacker/css/admin_v3/components/navigation.scss @@ -61,6 +61,8 @@ nav.menu { } #admin-menu { + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.05), 0px 2px 2px rgba(0, 0, 0, 0.07); + ul { display: flex; } @@ -135,6 +137,7 @@ nav.menu { #sub-menu { padding-bottom: 0; + box-shadow: 0px 1px 0px $color-7; li { a { From 51f47fc351c98700abc8982fdfc846868ff2a328 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 16:16:33 +0200 Subject: [PATCH 12/17] Add border bottom when hovering or selected + add some padding to separate those borders then --- .../css/admin_v3/components/navigation.scss | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/app/webpacker/css/admin_v3/components/navigation.scss b/app/webpacker/css/admin_v3/components/navigation.scss index 7846c41fcb..e56a12b8c1 100644 --- a/app/webpacker/css/admin_v3/components/navigation.scss +++ b/app/webpacker/css/admin_v3/components/navigation.scss @@ -70,6 +70,8 @@ nav.menu { li { min-width: 90px; flex-grow: 1; + padding-left: 2px; + padding-right: 2px; a { display: block; @@ -90,18 +92,7 @@ nav.menu { &:hover { color: $color-5 !important; - &:after { - content: ""; - position: absolute; - border-left: 10px solid transparent; - border-right: 10px solid transparent; - border-top: 5px solid $color-2; - bottom: 0px; - margin-bottom: -5px; - left: 50%; - margin-left: -10px; - z-index: 1; - } + border-bottom: 2px solid $color-5; } span.text { @@ -156,18 +147,7 @@ nav.menu { &.selected a, a:hover { color: $color-5; - &:after { - content: ""; - position: absolute; - border-left: 10px solid transparent; - border-right: 10px solid transparent; - border-top: 5px solid $color-2; - bottom: 0px; - margin-bottom: -5px; - left: 50%; - margin-left: -10px; - z-index: 0; - } + border-bottom: 2px solid $color-5; } } } From b865d8c1c0bcb51f9c8660e60b3561aab15cf1bb Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 16:18:38 +0200 Subject: [PATCH 13/17] Copy/Paste file `admin/shared/layout` under `admin_v3` folder + prettier --- app/webpacker/css/admin_v3/all.scss | 2 +- app/webpacker/css/admin_v3/shared/layout.scss | 134 ++++++++++++++++++ 2 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 app/webpacker/css/admin_v3/shared/layout.scss diff --git a/app/webpacker/css/admin_v3/all.scss b/app/webpacker/css/admin_v3/all.scss index b00611099d..4756a4d133 100644 --- a/app/webpacker/css/admin_v3/all.scss +++ b/app/webpacker/css/admin_v3/all.scss @@ -32,7 +32,7 @@ @import "../admin/shared/tables"; @import "../admin/shared/icons"; @import "../admin/shared/forms"; -@import "../admin/shared/layout"; +@import "shared/layout"; // admin_v3 @import "../admin/shared/scroll_bar"; @import "../admin/plugins/flatpickr-customization"; diff --git a/app/webpacker/css/admin_v3/shared/layout.scss b/app/webpacker/css/admin_v3/shared/layout.scss new file mode 100644 index 0000000000..35d4c2613d --- /dev/null +++ b/app/webpacker/css/admin_v3/shared/layout.scss @@ -0,0 +1,134 @@ +// Basics +//--------------------------------------------------- +* { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.admin { + &__section-header { + padding: 15px 0; + background-color: very-light($color-3, 4); + border-bottom: 1px solid $color-border; + + .ofn-drop-down { + border: 0; + background-color: $spree-blue; + color: $color-1; + float: none; + margin-left: 3px; + &:hover, + &.expanded { + border: 0; + color: $color-1; + } + } + + &__content { + display: flex; + align-items: center; + justify-content: space-between; + flex-wrap: wrap; + @media all and (min-width: $tablet_breakpoint) { + flex-wrap: nowrap; + } + } + + &__title { + width: 100%; + margin-bottom: 10px; + @media all and (min-width: $tablet_breakpoint) { + margin-bottom: 0; + } + } + + &__actions { + display: flex; + flex: 1 0 auto; + align-items: center; + list-style: none; + @media all and (min-width: $tablet_breakpoint) { + justify-content: flex-end; + } + > li { + display: flex; + margin-right: 10px; + &:empty { + display: none; + } + &:last-child { + margin-right: 0; + } + } + } + } +} + +.hidden { + display: none; +} + +.float-right { + float: right; +} + +.float-left { + float: left; +} + +.mr-0 { + margin-right: 0 !important; +} + +.ml-0 { + margin-left: 0 !important; +} + +@media print { + .print-hidden { + display: none !important; + } +} + +// Header +//--------------------------------------------------- +#header { + background-color: $color-1; + padding: 5px 0; +} + +#logo { + height: 40px; +} + +.page-title { + i { + color: $color-2; + } +} + +// Content +//--------------------------------------------------- +#content { + background-color: $color-1; + position: relative; + z-index: 0; + padding: 0; + margin-top: 15px; +} + +// Footer +//--------------------------------------------------- +#footer { + margin-top: 15px; + border-top: 1px solid $color-border; + padding: 10px 0; +} + +@media print { + header, + nav { + display: none; + } +} From 905220a055464b0670a964bab73035191d8fb2cb Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 16:21:42 +0200 Subject: [PATCH 14/17] Add new color: `$color-8 #191c1d Near-black` --- app/webpacker/css/admin_v3/globals/palette.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/webpacker/css/admin_v3/globals/palette.scss b/app/webpacker/css/admin_v3/globals/palette.scss index ad1c36bffd..859424e573 100644 --- a/app/webpacker/css/admin_v3/globals/palette.scss +++ b/app/webpacker/css/admin_v3/globals/palette.scss @@ -6,4 +6,5 @@ $color-4: #6788a2 !default; // Dark Blue $color-5: #c85136 !default; // Red/Orange (Mojo) $color-6: #ff9300 !default; // Yellow $color-7: #eff1f2 !default; // Light grey +$color-8: #191c1d !default; // Near-black $color-9: #2e3132 !default; // Dark Grey From d7f7ff74367fb378bfece316b2efb2e651fa41e0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 16:22:31 +0200 Subject: [PATCH 15/17] Remove background, border and adjust margin top --- app/webpacker/css/admin_v3/shared/layout.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/webpacker/css/admin_v3/shared/layout.scss b/app/webpacker/css/admin_v3/shared/layout.scss index 35d4c2613d..3ae725e8a9 100644 --- a/app/webpacker/css/admin_v3/shared/layout.scss +++ b/app/webpacker/css/admin_v3/shared/layout.scss @@ -9,8 +9,7 @@ .admin { &__section-header { padding: 15px 0; - background-color: very-light($color-3, 4); - border-bottom: 1px solid $color-border; + margin-top: 25px; .ofn-drop-down { border: 0; From d6cb483f0df2bc1a09e59d369c76fe61e87fdbe1 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 7 Jun 2023 16:22:52 +0200 Subject: [PATCH 16/17] Adjust color to the title of the page --- app/webpacker/css/admin_v3/shared/layout.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/webpacker/css/admin_v3/shared/layout.scss b/app/webpacker/css/admin_v3/shared/layout.scss index 3ae725e8a9..c5cd8c71e2 100644 --- a/app/webpacker/css/admin_v3/shared/layout.scss +++ b/app/webpacker/css/admin_v3/shared/layout.scss @@ -11,6 +11,10 @@ padding: 15px 0; margin-top: 25px; + h1 { + color: $color-8; + } + .ofn-drop-down { border: 0; background-color: $spree-blue; From e2ba18f82830e8523cf081e7f40a1babd12ef6b4 Mon Sep 17 00:00:00 2001 From: David Cook Date: Thu, 8 Jun 2023 10:47:28 +1000 Subject: [PATCH 17/17] Set sentence case tab names in Ruby instead of CSS I chose .capitalize instead of .humanize, because the latter has extra features which may not be desired. --- app/helpers/spree/admin/navigation_helper.rb | 2 +- app/webpacker/css/admin_v3/components/navigation.scss | 8 -------- spec/system/admin/bulk_order_management_spec.rb | 4 ++-- spec/system/admin/order_cycles/simple_spec.rb | 2 +- spec/system/admin/schedules_spec.rb | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/app/helpers/spree/admin/navigation_helper.rb b/app/helpers/spree/admin/navigation_helper.rb index b182b3fbae..330cf721ae 100644 --- a/app/helpers/spree/admin/navigation_helper.rb +++ b/app/helpers/spree/admin/navigation_helper.rb @@ -26,7 +26,7 @@ module Spree destination_url = options[:url] || spree.public_send("#{options[:route]}_path") titleized_label = Spree.t(options[:label], default: options[:label], - scope: [:admin, :tab]).titleize + scope: [:admin, :tab]).capitalize css_classes = [] diff --git a/app/webpacker/css/admin_v3/components/navigation.scss b/app/webpacker/css/admin_v3/components/navigation.scss index e56a12b8c1..3291225c01 100644 --- a/app/webpacker/css/admin_v3/components/navigation.scss +++ b/app/webpacker/css/admin_v3/components/navigation.scss @@ -77,10 +77,6 @@ nav.menu { display: block; padding: 25px 5px; color: $color-9 !important; - text-transform: lowercase; - &::first-letter { - text-transform: uppercase; - } position: relative; text-align: center; font-weight: 600; @@ -136,10 +132,6 @@ nav.menu { padding: 12px 20px; color: $color-9; text-align: center; - text-transform: lowercase; - &::first-letter { - text-transform: uppercase; - } position: relative; font-size: 14px; } diff --git a/spec/system/admin/bulk_order_management_spec.rb b/spec/system/admin/bulk_order_management_spec.rb index a82d1540b7..269e06ccb0 100644 --- a/spec/system/admin/bulk_order_management_spec.rb +++ b/spec/system/admin/bulk_order_management_spec.rb @@ -1195,8 +1195,8 @@ describe ' it "displays a Bulk Management Tab under the Orders item" do visit '/admin/orders' - expect(page).to have_link "Bulk Order Management" - click_link "Bulk Order Management" + expect(page).to have_link "Bulk order management" + click_link "Bulk order management" expect(page).to have_selector "h1.page-title", text: "Bulk Order Management" end diff --git a/spec/system/admin/order_cycles/simple_spec.rb b/spec/system/admin/order_cycles/simple_spec.rb index c2d71b9561..c05501d633 100644 --- a/spec/system/admin/order_cycles/simple_spec.rb +++ b/spec/system/admin/order_cycles/simple_spec.rb @@ -203,7 +203,7 @@ describe ' name: 'Order Cycle 2' ) visit spree.admin_dashboard_path - click_link "Order Cycles" + click_link "Order cycles" # I should see only the order cycle I am coordinating expect(page).to have_selector "tr.order-cycle-#{oc_user_coordinating.id}" diff --git a/spec/system/admin/schedules_spec.rb b/spec/system/admin/schedules_spec.rb index 07dfaf413b..8913d9af18 100644 --- a/spec/system/admin/schedules_spec.rb +++ b/spec/system/admin/schedules_spec.rb @@ -30,7 +30,7 @@ describe 'Schedules' do describe "Adding a new Schedule" do it "immediately shows the schedule in the order cycle list once created" do visit spree.admin_dashboard_path - click_link 'Order Cycles' + click_link 'Order cycles' expect(page).to have_selector ".order-cycle-#{oc1.id}" find('a', text: 'NEW SCHEDULE').click