raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-17 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move variables to one variables file

Browse Source 
Note that color-tbl-border is not needed in the new admin_v3 styles.
This commit is contained in:
David Cook
2023-06-22 16:39:55 +10:00
parent 0aa4c144b9
commit 293e135a45
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/webpacker/css/admin/all.scss
View File

@@ -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";

7
app/webpacker/css/admin/globals/variables.scss
View File

@@ -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;

7
app/webpacker/css/admin/variables.scss
View File

@@ -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;

2
app/webpacker/css/admin_v3/all.scss
View File

@@ -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";

7
app/webpacker/css/admin_v3/globals/variables.scss
View File

@@ -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;

1
app/webpacker/css/mail/all.scss
View File

@@ -1,4 +1,3 @@
@import '../admin/globals/palette.scss';
@import '../admin/variables';
@import 'email';
@import 'payments_list';