diff --git a/.prettierignore b/.prettierignore index ec07eb9993..e6c0ce1c7f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -13,7 +13,8 @@ postcss.config.js # SCSS # Enabled: most of admin -/app/webpacker/css/admin/globals/ +/app/webpacker/css/admin/globals/mixins.scss +/app/webpacker/css/admin/globals/variables.scss /app/webpacker/css/admin/shared/ /app/webpacker/css/admin_v3/globals/variables.scss /app/webpacker/css/darkswarm/ diff --git a/app/webpacker/css/admin/globals/functions.scss b/app/webpacker/css/admin/globals/functions.scss index 0abf3546f6..ec66b57c56 100644 --- a/app/webpacker/css/admin/globals/functions.scss +++ b/app/webpacker/css/admin/globals/functions.scss @@ -1,23 +1,22 @@ // Make color very close to white -@function very-light($color, $adjust: 3){ - @if type-of($adjust) == 'number' and $adjust > 0 { +@function very-light($color, $adjust: 3) { + @if type-of($adjust) == "number" and $adjust > 0 { @for $i from 0 through 100 { @if lighten($color, $i) == white and ($i - $adjust) > $adjust { @return lighten($color, $i - $adjust); } } + } @else { + @debug "Please correct $adjust value. It should be number and larger then 0. Currently it is '#{type-of($adjust)}' with value '#{$adjust}'"; } - @else { - @debug "Please correct $adjust value. It should be number and larger then 0. Currently it is '#{type-of($adjust)}' with value '#{$adjust}'" - } -}; +} // Quick fix for dynamic variables missing in SASS @function get-value($prop, $val, $search) { $n1: index($prop, $search); $n2: index($val, $search); - @if($n1) { + @if ($n1) { @return nth($val, $n1); } @else { @return nth($prop, $n2); diff --git a/app/webpacker/css/admin/globals/palette.scss b/app/webpacker/css/admin/globals/palette.scss index 776dc9cda8..2648d0e66e 100644 --- a/app/webpacker/css/admin/globals/palette.scss +++ b/app/webpacker/css/admin/globals/palette.scss @@ -1,10 +1,10 @@ // 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 +$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 $dark-grey: #333; $light-grey: #ddd;