From 293e135a4585e475d3333cd9ffd71592a82563d1 Mon Sep 17 00:00:00 2001 From: David Cook Date: Thu, 22 Jun 2023 16:39:55 +1000 Subject: [PATCH] Move variables to one variables file Note that color-tbl-border is not needed in the new admin_v3 styles. --- app/webpacker/css/admin/all.scss | 2 -- app/webpacker/css/admin/globals/variables.scss | 7 +++++++ app/webpacker/css/admin/variables.scss | 7 ------- app/webpacker/css/admin_v3/all.scss | 2 -- app/webpacker/css/admin_v3/globals/variables.scss | 7 +++++++ app/webpacker/css/mail/all.scss | 1 - 6 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 app/webpacker/css/admin/variables.scss diff --git a/app/webpacker/css/admin/all.scss b/app/webpacker/css/admin/all.scss index ea19d92b46..c9ac1e54ac 100644 --- a/app/webpacker/css/admin/all.scss +++ b/app/webpacker/css/admin/all.scss @@ -16,7 +16,6 @@ @import "globals/functions"; @import "globals/palette"; @import "globals/variables"; -@import "variables"; @import "globals/mixins"; @import "plugins/font-awesome"; @@ -111,7 +110,6 @@ @import "tag_rules"; @import "terms_of_service_files"; @import "validation"; -@import "variables"; @import "variant_overrides"; @import "welcome"; diff --git a/app/webpacker/css/admin/globals/variables.scss b/app/webpacker/css/admin/globals/variables.scss index 167d5fe2f6..86fb56b7af 100644 --- a/app/webpacker/css/admin/globals/variables.scss +++ b/app/webpacker/css/admin/globals/variables.scss @@ -23,18 +23,21 @@ $color-border: very-light($color-3, 12) !default; // Basic flash colors $color-success: $color-2 !default; $color-notice: $color-6 !default; +$color-warning: $color-5 !default; $color-error: $color-5 !default; // Table colors $color-tbl-odd: $color-1 !default; $color-tbl-even: very-light($color-3, 4) !default; $color-tbl-thead: very-light($color-3, 4) !default; +$color-tbl-border: $pale-blue !default; // Button colors $color-btn-bg: $color-3 !default; $color-btn-text: $color-1 !default; $color-btn-hover-bg: $color-2 !default; $color-btn-hover-text: $color-1 !default; +$color-btn-disabled-bg: $light-grey !default; // Actions colors $color-action-edit-bg: very-light($color-success, 5 ) !default; @@ -65,6 +68,10 @@ $color-txt-brd: $color-border !default; $color-txt-text: $color-3 !default; $color-txt-hover-brd: $color-2 !default; +// Modal colors +$color-modal-close-btn: $color-5 !default; +$color-modal-close-btn-hover: darken($color-5, 5%) !default; + // States label colors $color-ste-complete-bg: $color-success !default; $color-ste-complete-text: $color-1 !default; diff --git a/app/webpacker/css/admin/variables.scss b/app/webpacker/css/admin/variables.scss deleted file mode 100644 index ba1518ee95..0000000000 --- a/app/webpacker/css/admin/variables.scss +++ /dev/null @@ -1,7 +0,0 @@ -// Admin variables and colours -$color-warning: $color-5; -$color-tbl-border: $pale-blue; - -$color-modal-close-btn: $color-5; -$color-modal-close-btn-hover: darken($color-5, 5%); -$color-btn-disabled-bg: $light-grey; diff --git a/app/webpacker/css/admin_v3/all.scss b/app/webpacker/css/admin_v3/all.scss index 4cbc555727..f682daf3f0 100644 --- a/app/webpacker/css/admin_v3/all.scss +++ b/app/webpacker/css/admin_v3/all.scss @@ -20,7 +20,6 @@ @import "../admin/globals/functions"; @import "globals/palette"; // admin_v3 @import "globals/variables"; // admin_v3 -@import "../admin/variables"; @import "../admin/globals/mixins"; @import "mixins"; // admin_v3 @@ -117,7 +116,6 @@ @import "../admin/tag_rules"; @import "../admin/terms_of_service_files"; @import "../admin/validation"; -@import "../admin/variables"; @import "../admin/variant_overrides"; @import "../admin/welcome"; diff --git a/app/webpacker/css/admin_v3/globals/variables.scss b/app/webpacker/css/admin_v3/globals/variables.scss index 3c9ef5faa7..de8975e93d 100644 --- a/app/webpacker/css/admin_v3/globals/variables.scss +++ b/app/webpacker/css/admin_v3/globals/variables.scss @@ -23,6 +23,7 @@ $color-border: $light-grey !default; // Basic flash colors $color-success: $green !default; $color-notice: $yellow !default; +$color-warning: $red !default; $color-error: $red !default; // Table styles @@ -31,6 +32,7 @@ $color-tbl-cell-bg: $white !default; $color-tbl-cell-shadow: rgb(0, 0, 0, 0.15) !default; $color-tbl-thead-txt: $color-headers !default; $color-tbl-thead-bg: $light-grey !default; +$color-tbl-border: $pale-blue !default; $padding-tbl-cell: 12px 12px; $padding-tbl-cell-condensed: 10px 12px; $padding-tbl-cell-relaxed: 16px 12px; @@ -42,6 +44,7 @@ $color-btn-shadow: 0px 1px 0px rgba(0, 0, 0, 0.05), 0px 2px 2px rg $color-btn-hover-bg: $orient !default; $color-btn-hover-text: $white !default; $color-btn-hover-border: $dark-blue !default; +$color-btn-disabled-bg: $light-grey !default; // Actions colors $color-action-edit-bg: very-light($color-success, 5 ) !default; @@ -72,6 +75,10 @@ $color-txt-brd: $color-border !default; $color-txt-text: $near-black !default; $color-txt-hover-brd: $teal !default; +// Modal colors +$color-modal-close-btn: $color-5 !default; +$color-modal-close-btn-hover: darken($color-5, 5%) !default; + // States label colors $color-ste-complete-bg: $color-success !default; $color-ste-complete-text: $white !default; diff --git a/app/webpacker/css/mail/all.scss b/app/webpacker/css/mail/all.scss index fb4d0596b2..087d2d1310 100644 --- a/app/webpacker/css/mail/all.scss +++ b/app/webpacker/css/mail/all.scss @@ -1,4 +1,3 @@ @import '../admin/globals/palette.scss'; -@import '../admin/variables'; @import 'email'; @import 'payments_list';