diff options
| author | Mark Otto <markd.otto@gmail.com> | 2020-11-13 21:50:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-13 21:50:59 +0300 |
| commit | 55f2192a398cdb4446937322f14b3e7e359a0d00 (patch) | |
| tree | e71a118fc14cbd68e59be239ade796cb4666911c /scss/_variables.scss | |
| parent | 483b6413e90e5ae01cc7719cb6388bc175d3b275 (diff) | |
Rename scale-color() function to shift-color() to avoid collision with Sass's own color function (#32149)
Diffstat (limited to 'scss/_variables.scss')
| -rw-r--r-- | scss/_variables.scss | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss index 2a8b45e14c..0b64330e96 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -275,7 +275,7 @@ $body-text-align: null !default; $link-color: $primary !default; $link-decoration: underline !default; $link-shade-percentage: 20% !default; -$link-hover-color: scale-color($link-color, $link-shade-percentage) !default; +$link-hover-color: shift-color($link-color, $link-shade-percentage) !default; $link-hover-decoration: null !default; $stretched-link-pseudo-element: after !default; @@ -535,12 +535,12 @@ $table-caption-color: $text-muted !default; $table-bg-scale: -80% !default; $table-variants: ( - "primary": scale-color($primary, $table-bg-scale), - "secondary": scale-color($secondary, $table-bg-scale), - "success": scale-color($success, $table-bg-scale), - "info": scale-color($info, $table-bg-scale), - "warning": scale-color($warning, $table-bg-scale), - "danger": scale-color($danger, $table-bg-scale), + "primary": shift-color($primary, $table-bg-scale), + "secondary": shift-color($secondary, $table-bg-scale), + "success": shift-color($success, $table-bg-scale), + "info": shift-color($info, $table-bg-scale), + "warning": shift-color($warning, $table-bg-scale), + "danger": shift-color($danger, $table-bg-scale), "light": $light, "dark": $dark, ) !default; |