diff --git a/backend/app/assets/stylesheets/spree/backend/components/_messages.scss b/backend/app/assets/stylesheets/spree/backend/components/_messages.scss index 757fce36294..2ec1a44c48a 100644 --- a/backend/app/assets/stylesheets/spree/backend/components/_messages.scss +++ b/backend/app/assets/stylesheets/spree/backend/components/_messages.scss @@ -40,15 +40,15 @@ color: $body-color; &.notice { - background-color: rgba(very-light($color-notice, 15), .95); + background-color: rgba(lighten($color-notice, 15), .95); border-top-color: $color-notice; } &.success { - background-color: rgba(very-light($color-success, 30), .95); + background-color: rgba(lighten($color-success, 30), .95); border-top-color: $color-success; } &.error { - background-color: rgba(very-light($color-error, 30), .95); + background-color: rgba(lighten($color-error, 30), .95); border-top-color: $color-error; } } diff --git a/backend/app/assets/stylesheets/spree/backend/globals/_functions.scss b/backend/app/assets/stylesheets/spree/backend/globals/_functions.scss index c110f4e9afb..6faadbbd92f 100644 --- a/backend/app/assets/stylesheets/spree/backend/globals/_functions.scss +++ b/backend/app/assets/stylesheets/spree/backend/globals/_functions.scss @@ -1,5 +1,7 @@ // Make color very close to white @function very-light($color, $adjust: 3){ + @warn "The `very-light` function is deprecated. Please use the default sass `lighten` function, instead."; + @if type-of($adjust) == 'number' and $adjust > 0 { @for $i from 0 through 100 { @if lighten($color, $i) == white and ($i - $adjust) > $adjust { diff --git a/backend/app/assets/stylesheets/spree/backend/globals/_variables.scss b/backend/app/assets/stylesheets/spree/backend/globals/_variables.scss index 12323846a09..00cc0c4c08e 100644 --- a/backend/app/assets/stylesheets/spree/backend/globals/_variables.scss +++ b/backend/app/assets/stylesheets/spree/backend/globals/_variables.scss @@ -89,8 +89,8 @@ $color-style-guide-table-border: #CEE1F4; // Table colors $color-tbl-odd: $color-white !default; -$color-tbl-even: very-light($color-dark-light, 4) !default; -$color-tbl-thead: very-light($color-dark-light, 4) !default; +$color-tbl-even: $color-light !default; +$color-tbl-thead: $color-light !default; // Pill colors // @@ -114,24 +114,24 @@ $color-pill-error: #ff967b; $color-pill-error-text: $color-pill-text; // Actions colors -$color-action-edit-bg: very-light($color-success, 5 ) !default; -$color-action-edit-brd: very-light($color-success, 20 ) !default; -$color-action-clone-bg: very-light($color-notice, 5 ) !default; -$color-action-clone-brd: very-light($color-notice, 15 ) !default; -$color-action-remove-bg: very-light($color-error, 5 ) !default; -$color-action-remove-brd: very-light($color-error, 10 ) !default; -$color-action-void-bg: very-light($color-error, 10 ) !default; -$color-action-void-brd: very-light($color-error, 20 ) !default; -$color-action-cancel-bg: very-light($color-notice, 10 ) !default; -$color-action-cancel-brd: very-light($color-notice, 20 ) !default; -$color-action-capture-bg: very-light($color-success, 5 ) !default; -$color-action-capture-brd: very-light($color-success, 20 ) !default; -$color-action-save-bg: very-light($color-success, 5 ) !default; -$color-action-save-brd: very-light($color-success, 20 ) !default; -$color-action-mail-bg: very-light($color-success, 5 ) !default; -$color-action-mail-brd: very-light($color-success, 20 ) !default; -$color-action-failure-bg: very-light($color-error, 10 ) !default; -$color-action-failure-brd: very-light($color-error, 20 ) !default; +$color-action-edit-bg: lighten($color-success, (5 * 5) ) !default; +$color-action-edit-brd: lighten($color-success, (20 * 5) ) !default; +$color-action-clone-bg: lighten($color-notice, (5 * 5) ) !default; +$color-action-clone-brd: lighten($color-notice, (15 * 5) ) !default; +$color-action-remove-bg: lighten($color-error, (5 * 5) ) !default; +$color-action-remove-brd: lighten($color-error, (10 * 5) ) !default; +$color-action-void-bg: lighten($color-error, (10 * 5) ) !default; +$color-action-void-brd: lighten($color-error, (20 * 5) ) !default; +$color-action-cancel-bg: lighten($color-notice, (10 * 5) ) !default; +$color-action-cancel-brd: lighten($color-notice, (20 * 5) ) !default; +$color-action-capture-bg: lighten($color-success, (5 * 5) ) !default; +$color-action-capture-brd: lighten($color-success, (20 * 5) ) !default; +$color-action-save-bg: lighten($color-success, (5 * 5) ) !default; +$color-action-save-brd: lighten($color-success, (20 * 5) ) !default; +$color-action-mail-bg: lighten($color-success, (5 * 5) ) !default; +$color-action-mail-brd: lighten($color-success, (20 * 5) ) !default; +$color-action-failure-bg: lighten($color-error, (10 * 5) ) !default; +$color-action-failure-brd: lighten($color-error, (20 * 5) ) !default; // Available states $states: ( diff --git a/backend/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss b/backend/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss index 04dac0d84cc..b06762cc1b2 100644 --- a/backend/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss +++ b/backend/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss @@ -12,7 +12,7 @@ } .taxon { - background-color: very-light($color-dark-light); + background-color: $color-light; border: 1px solid $color-border; border-radius: $border-radius; color: $body-color; diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss b/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss index b09f86dc1cf..8b22cf9177b 100644 --- a/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss +++ b/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss @@ -114,8 +114,8 @@ table { tbody { tr { &.deleted td { - background-color: very-light(theme-color("danger"), 6); - border-color: very-light(theme-color("danger"), 15); + background-color: lighten(theme-color("danger"), 6); + border-color: lighten(theme-color("danger"), 15); } }