diff --git a/app/views/spree/admin/shared/_head.html.haml b/app/views/spree/admin/shared/_head.html.haml index 254e893bfc..69d501bb17 100644 --- a/app/views/spree/admin/shared/_head.html.haml +++ b/app/views/spree/admin/shared/_head.html.haml @@ -14,7 +14,10 @@ %link{:href => "https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600,700&subset=latin,cyrillic,greek,vietnamese", :rel => "stylesheet", :type => "text/css"} -= stylesheet_pack_tag 'admin-styles', media: "screen, print" +- if feature?(:admin_style_v2, spree_current_user) + = stylesheet_pack_tag 'admin-styles-v2', media: "screen, print" +- else + = stylesheet_pack_tag 'admin-styles', media: "screen, print" = render "layouts/bugsnag_js" = javascript_include_tag 'admin/all' diff --git a/app/webpacker/css/admin/globals/palette.scss b/app/webpacker/css/admin/globals/palette.scss new file mode 100644 index 0000000000..6b343d22c1 --- /dev/null +++ b/app/webpacker/css/admin/globals/palette.scss @@ -0,0 +1,16 @@ +// Basic color palette for admin +$color-1: #FFFFFF !default; // White +$color-2: #9FC820 !default; // Green +$color-3: #5498DA !default; // Light Blue +$color-4: #6788A2 !default; // Dark Blue +$color-5: #C60F13 !default; // Red +$color-6: #FF9300 !default; // Yellow + +@mixin basicColorPalette($color1, $color2, $color3, $color4, $color5, $color6) { + $color-1: $color1 !global; + $color-2: $color2 !global; + $color-3: $color3 !global; + $color-4: $color4 !global; + $color-5: $color5 !global; + $color-6: $color6 !global; +} diff --git a/app/webpacker/css/admin/globals/variables.scss b/app/webpacker/css/admin/globals/variables.scss index 204b4f799d..46fc8fe036 100644 --- a/app/webpacker/css/admin/globals/variables.scss +++ b/app/webpacker/css/admin/globals/variables.scss @@ -9,14 +9,6 @@ $base-font-family: "Open Sans", "Helvetica Neue", "Helvetica", Helvetica, Arial, // Colors //-------------------------------------------------------------- -// Basic color palette for admin -$color-1: #FFFFFF !default; // White -$color-2: #9FC820 !default; // Green -$color-3: #5498DA !default; // Light Blue -$color-4: #6788A2 !default; // Dark Blue -$color-5: #C60F13 !default; // Red -$color-6: #FF9300 !default; // Yellow - // Body base colors $color-body-bg: $color-1 !default; $color-body-text: $color-4 !default; diff --git a/app/webpacker/css/admin/v2/shared/typography.scss b/app/webpacker/css/admin/v2/shared/typography.scss index f0dcc73983..dcda9fb4bb 100644 --- a/app/webpacker/css/admin/v2/shared/typography.scss +++ b/app/webpacker/css/admin/v2/shared/typography.scss @@ -10,8 +10,6 @@ } body.admin.admin-v2 { - color: $v2-body-grey; - a:not(.button) { @include v2-link-color(); } diff --git a/app/webpacker/css/admin/v2/variables.scss b/app/webpacker/css/admin/v2/variables.scss index ddaba6a9f0..c8ace9e880 100644 --- a/app/webpacker/css/admin/v2/variables.scss +++ b/app/webpacker/css/admin/v2/variables.scss @@ -7,7 +7,7 @@ $v2-orange-lightest: #fcdbd4; $v2-dark-grey: #333333; $v2-medium-dark-grey: #444444; -$v2-body-grey: #666666; +$v2-body-grey: $color-4; $v2-medium-grey: #717171; $v2-medium-light-grey: #e6e6e6; $v2-light-grey: #e7e7e7; diff --git a/app/webpacker/packs/admin-styles-v2.scss b/app/webpacker/packs/admin-styles-v2.scss new file mode 100644 index 0000000000..e9df2bae39 --- /dev/null +++ b/app/webpacker/packs/admin-styles-v2.scss @@ -0,0 +1,4 @@ +@import '../css/admin/globals/palette'; +@include basicColorPalette(#FFFFFF, #69A95D, #14B6CC, #484848, #C1122B, #F27052); + +@import "../css/admin/all.scss"; diff --git a/app/webpacker/packs/admin-styles.scss b/app/webpacker/packs/admin-styles.scss index 59e774d496..9cb8a5287f 100644 --- a/app/webpacker/packs/admin-styles.scss +++ b/app/webpacker/packs/admin-styles.scss @@ -1 +1,3 @@ +@import '../css/admin/globals/palette'; + @import "../css/admin/all.scss";