Skip to content

Commit 6c32a05

Browse files
committed
refactor: change background to bg
1 parent d8ccba7 commit 6c32a05

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

scss/_alert.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
// Generate contextual modifier classes for colorizing the alert.
4848

4949
@each $state, $map in $alert-variants {
50-
$background: map-get($map, "background");
50+
$background: map-get($map, "bg");
5151
$border-color: map-get($map, "border-color");
52-
$color: contrast-ratio-correction(map-get($map, "color"), map-get($map, "background"), abs($alert-color-scale), $state);
52+
$color: contrast-ratio-correction(map-get($map, "color"), map-get($map, "bg"), abs($alert-color-scale), $state);
5353
$link-color: map-get($map, "link-color");
5454

5555
.alert-#{$state} {

scss/_buttons.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@
8888
@each $state, $map in $button-variants {
8989
.btn-#{$state} {
9090
@include button-variant(
91-
$background: map-get($map, "background"),
91+
$background: map-get($map, "bg"),
9292
$border-color: map-get($map, "border-color"),
9393
$color: map-get($map, "color"),
94-
$hover-background: map-get($map, "hover-background"),
94+
$hover-background: map-get($map, "hover-bg"),
9595
$hover-border-color: map-get($map, "hover-border-color"),
9696
$hover-color: map-get($map, "hover-color"),
97-
$active-background: map-get($map, "active-background"),
97+
$active-background: map-get($map, "active-bg"),
9898
$active-border-color: map-get($map, "active-border-color"),
9999
$active-color: map-get($map, "active-color"),
100-
$disabled-background: map-get($map, "disabled-background"),
100+
$disabled-background: map-get($map, "disabled-bg"),
101101
$disabled-border-color: map-get($map, "disabled-border-color"),
102102
$disabled-color: map-get($map, "disabled-color"),
103103
$shadow: map-get($map, "shadow")
@@ -111,10 +111,10 @@
111111
.btn-outline-#{$state} {
112112
@include button-outline-variant(
113113
$color: map-get($map, "color"),
114-
$hover-background: map-get($map, "hover-background"),
114+
$hover-background: map-get($map, "hover-bg"),
115115
$hover-border-color: map-get($map, "hover-border-color"),
116116
$hover-color: map-get($map, "hover-color"),
117-
$active-background: map-get($map, "active-background"),
117+
$active-background: map-get($map, "active-bg"),
118118
$active-border-color: map-get($map, "active-border-color"),
119119
$active-color: map-get($map, "active-color"),
120120
$disabled-color: map-get($map, "disabled-color"),
@@ -129,10 +129,10 @@
129129
.btn-ghost-#{$state} {
130130
@include button-ghost-variant(
131131
$color: map-get($map, "color"),
132-
$hover-background: map-get($map, "hover-background"),
132+
$hover-background: map-get($map, "hover-bg"),
133133
$hover-border-color: map-get($map, "hover-border-color"),
134134
$hover-color: map-get($map, "hover-color"),
135-
$active-background: map-get($map, "active-background"),
135+
$active-background: map-get($map, "active-bg"),
136136
$active-border-color: map-get($map, "active-border-color"),
137137
$active-color: map-get($map, "active-color"),
138138
$disabled-color: map-get($map, "disabled-color"),

scss/_functions.scss

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
183183
// scss-docs-start alert-color-functions
184184
@function alert-color-map($color) {
185185
@return (
186-
"background": shift-color($color, $alert-bg-scale),
186+
"bg": shift-color($color, $alert-bg-scale),
187187
"border-color": shift-color($color, $alert-border-scale),
188188
"color": shift-color($color, $alert-color-scale),
189189
"link-color": shade-color(shift-color($color, $alert-color-scale), 20%)
@@ -198,16 +198,16 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
198198

199199
@function btn-color-map($background, $border-color) {
200200
@return (
201-
"background": $background,
201+
"bg": $background,
202202
"border-color": $border-color,
203203
"color": color-contrast($background),
204-
"hover-background": btn-color($background, $btn-hover-bg-shade-amount, $btn-hover-bg-tint-amount),
204+
"hover-bg": btn-color($background, $btn-hover-bg-shade-amount, $btn-hover-bg-tint-amount),
205205
"hover-border-color": btn-color($border-color, $btn-hover-border-shade-amount, $btn-hover-border-tint-amount),
206206
"hover-color": color-contrast(btn-color($background, $btn-hover-bg-shade-amount, $btn-hover-bg-tint-amount)),
207-
"active-background": btn-color($background, $btn-active-bg-shade-amount, $btn-active-bg-tint-amount),
207+
"active-bg": btn-color($background, $btn-active-bg-shade-amount, $btn-active-bg-tint-amount),
208208
"active-border-color": btn-color($border-color, $btn-active-border-shade-amount, $btn-active-border-tint-amount),
209209
"active-color": color-contrast(btn-color($border-color, $btn-active-border-shade-amount, $btn-active-border-tint-amount)),
210-
"disabled-background": $background,
210+
"disabled-bg": $background,
211211
"disabled-border-color": $border-color,
212212
"disabled-color": color-contrast($background),
213213
"shadow": rgba(mix($background, $border-color, 15%), .5)
@@ -217,10 +217,10 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
217217
@function btn-outline-color-map($background) {
218218
@return (
219219
"color": $background,
220-
"hover-background": btn-color($background, $btn-hover-bg-shade-amount, $btn-hover-bg-tint-amount),
220+
"hover-bg": btn-color($background, $btn-hover-bg-shade-amount, $btn-hover-bg-tint-amount),
221221
"hover-border-color": btn-color($background, $btn-hover-border-shade-amount, $btn-hover-border-tint-amount),
222222
"hover-color": color-contrast(btn-color($background, $btn-hover-bg-shade-amount, $btn-hover-bg-tint-amount)),
223-
"active-background": btn-color($background, $btn-active-bg-shade-amount, $btn-active-bg-tint-amount),
223+
"active-bg": btn-color($background, $btn-active-bg-shade-amount, $btn-active-bg-tint-amount),
224224
"active-border-color": btn-color($background, $btn-active-border-shade-amount, $btn-active-border-tint-amount),
225225
"active-color": color-contrast(btn-color($background, $btn-active-border-shade-amount, $btn-active-border-tint-amount)),
226226
"disabled-color": $background,
@@ -232,15 +232,15 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
232232
// scss-docs-start list-group-color-functions
233233
@function list-group-color-map($color) {
234234
@return (
235-
"background": shift-color($color, $list-group-item-bg-scale),
236-
"background-hover": shade-color($color, 10%),
235+
"bg": shift-color($color, $list-group-item-bg-scale),
236+
"bg-hover": shade-color($color, 10%),
237237
"color": shift-color($color, $list-group-item-color-scale)
238238
);
239239
}
240240
// scss-docs-end list-group-color-functions
241241

242242
// scss-docs-start table-color-functions
243-
@function table-color-map($background) {
243+
@function table-color-map($background, $body-bg: $body-bg) {
244244
$color: color-contrast(opaque($body-bg, $background));
245245
$striped-bg: mix($color, $background, percentage($table-striped-bg-factor));
246246
$active-bg: mix($color, $background, percentage($table-active-bg-factor));

0 commit comments

Comments
 (0)