From f758daadc06f41d06fb38e12cc0bc4b1f9aa5d11 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 15 Dec 2023 16:21:43 +1100 Subject: [PATCH] Use common colours in old and new design --- app/webpacker/css/admin/connected_apps.scss | 6 +++--- app/webpacker/css/admin/globals/palette.scss | 1 + app/webpacker/css/admin_v3/globals/palette.scss | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/webpacker/css/admin/connected_apps.scss b/app/webpacker/css/admin/connected_apps.scss index b487089182..efcf8d16f3 100644 --- a/app/webpacker/css/admin/connected_apps.scss +++ b/app/webpacker/css/admin/connected_apps.scss @@ -18,10 +18,10 @@ display: flex; justify-content: space-between; - background-color: #f8f9fa; + background-color: $color-14; border: none; - border-left: 4px solid #008397; - border-radius: 4px; + border-left: $border-radius solid $color-3; + border-radius: $border-radius; box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.05), 0px 2px 2px rgba(0, 0, 0, 0.07); margin: 2em 0; padding: 0.5em 1em; diff --git a/app/webpacker/css/admin/globals/palette.scss b/app/webpacker/css/admin/globals/palette.scss index b591605326..5a64d064f7 100644 --- a/app/webpacker/css/admin/globals/palette.scss +++ b/app/webpacker/css/admin/globals/palette.scss @@ -13,6 +13,7 @@ $color-3: $spree-blue !default; // Light Blue $color-4: #6788a2 !default; // Dark Blue $color-5: #c60f13 !default; // Red $color-6: #ff9300 !default; // Yellow +$color-14: #f8f9fa !default; // Lighter grey $dark-grey: #333; $light-grey: #ddd; diff --git a/app/webpacker/css/admin_v3/globals/palette.scss b/app/webpacker/css/admin_v3/globals/palette.scss index 59b3c88c3a..7779028ad4 100644 --- a/app/webpacker/css/admin_v3/globals/palette.scss +++ b/app/webpacker/css/admin_v3/globals/palette.scss @@ -34,3 +34,4 @@ $color-10: $orient; $color-11: $mystic; $color-12: $fair-pink; $color-13: $roof-terracotta; +$color-14: $lighter-grey;