Skip to content

Commit c7bb051

Browse files
committed
Fixes consistency of variable usage
1 parent e7590db commit c7bb051

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

src/scss/buttons/_base.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
text-align: center;
2121
white-space: nowrap;
2222
line-height: $button-line-height;
23-
border-width: 1px;
23+
border-width: $button-border-width;
2424
border-style: solid;
2525
border-radius: $button-border-radius;
2626
transition: $button-transition;

src/scss/buttons/_group.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
flex-shrink: 0;
88
border-radius: 0;
99
+ .button {
10-
margin-left: -1px;
10+
margin-left: -$button-border-width;
1111
}
1212
&.active:not(:disabled),
1313
&:active:not(:disabled) {
1414
z-index: 1;
1515
}
1616
&:first-child:not(.button-text) {
17-
border-top-left-radius: $component-border-radius;
18-
border-bottom-left-radius: $component-border-radius;
17+
border-top-left-radius: $button-border-radius;
18+
border-bottom-left-radius: $button-border-radius;
1919
}
2020
&:last-child:not(.button-text) {
21-
border-top-right-radius: $component-border-radius;
22-
border-bottom-right-radius: $component-border-radius;
21+
border-top-right-radius: $button-border-radius;
22+
border-bottom-right-radius: $button-border-radius;
2323
}
2424
}
2525
&-grow {

src/scss/buttons/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ $button-font-size: $font-size-base !default;
2727
$button-font-weight: 500 !default;
2828
$button-line-height: 1.5em !default;
2929
$button-text-transform: uppercase !default;
30+
$button-border-width: $component-border-width !default;
3031
$button-border-radius: $component-border-radius-sm !default;
3132
$button-padding-y: $component-padding-sm !default;
3233
$button-padding-x: $component-padding !default;

src/scss/cards/_borderless.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010
}
1111
&-shadow {
12-
box-shadow: $component-box-shadow;
12+
box-shadow: $card-box-shadow;
1313
}
1414
&-list {
1515
display: flex;

src/scss/tables/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $table-cell-padding-x: 0.6rem !default;
3333
$table-cell-padding: $table-cell-padding-y $table-cell-padding-x !default;
3434
$table-cell-hover-background-color: var(--component-background-color-hover, #{$component-background-color-hover}) !default;
3535
$table-cell-striped-background-color: var(--component-background-color-alt, #{$component-background-color-alt}) !default;
36-
$table-border-size: $component-border-width !default;
36+
$table-border-width: $component-border-width !default;
3737
$table-border-color: var(--component-border-color, #{$component-border-color}) !default;
3838
$table-border-radius: $component-border-radius !default;
3939
```

src/scss/tables/_bordered.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22

33
@if ($table-enabled) {
44
.table-bordered {
5-
border: $table-border-size solid $table-border-color;
5+
border: $table-border-width solid $table-border-color;
66
border-radius: $table-border-radius;
77
> thead {
88
> tr {
99
> th,
1010
> td {
11-
border: $table-border-size solid $table-border-color;
11+
border: $table-border-width solid $table-border-color;
1212
}
1313
}
1414
}
1515
> tbody {
1616
> tr {
1717
> th,
1818
> td {
19-
border: $table-border-size solid $table-border-color;
19+
border: $table-border-width solid $table-border-color;
2020
}
2121
}
2222
}
2323
> tfoot {
2424
> tr {
2525
> th,
2626
> td {
27-
border: $table-border-size solid $table-border-color;
27+
border: $table-border-width solid $table-border-color;
2828
}
2929
}
3030
}

src/scss/tables/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ $table-cell-padding-x: $spacer-sm !default;
66
$table-cell-padding: $table-cell-padding-y $table-cell-padding-x !default;
77
$table-cell-hover-background-color: var(--component-background-color-hover, #{$component-background-color-hover}) !default;
88
$table-cell-striped-background-color: var(--component-background-color-alt, #{$component-background-color-alt}) !default;
9-
$table-border-size: $component-border-width !default;
9+
$table-border-width: $component-border-width !default;
1010
$table-border-color: var(--component-border-color, #{$component-border-color}) !default;
1111
$table-border-radius: $component-border-radius !default;

0 commit comments

Comments
 (0)