Skip to content

Commit 5603956

Browse files
committed
Merge branch 'TMS-1164' into stage
2 parents 9e6fd83 + b143908 commit 5603956

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

assets/styles/helpers/_button.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ $button-transition-speed: $speed !default;
120120
&:focus,
121121
&.is-focused {
122122
text-decoration: underline !important;
123+
color: currentColor;
123124

124125
@extend .button-state-hover;
125126

@@ -288,7 +289,7 @@ $button-transition-speed: $speed !default;
288289
&,
289290
&:active,
290291
&.is-active {
291-
@include button_colors($btn-pair-primary, $btn-pair-primary-text-invert, transparent);
292+
// @include button_colors($btn-pair-primary, $btn-pair-primary-text-invert, transparent);
292293
border-color: transparent !important;
293294
}
294295

@@ -300,7 +301,7 @@ $button-transition-speed: $speed !default;
300301
&,
301302
&:active,
302303
&.is-active {
303-
@include button_colors($btn-pair-primary-invert, $btn-pair-primary-text, $btn-pair-primary-invert);
304+
// @include button_colors($btn-pair-primary-invert, $btn-pair-primary-text, $btn-pair-primary-invert);
304305
}
305306

306307
&:hover,
@@ -316,7 +317,7 @@ $button-transition-speed: $speed !default;
316317
&,
317318
&:active,
318319
&.is-active {
319-
@include button_colors(transparent, $btn-pair-primary-text-invert, $btn-pair-primary-text-invert);
320+
// @include button_colors(transparent, $btn-pair-primary-text-invert, $btn-pair-primary-text-invert);
320321
}
321322

322323
&:hover,

assets/styles/helpers/_color.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@
9595
fill: $color-invert !important;
9696
}
9797

98+
.button .icon {
99+
fill: currentColor !important;
100+
}
101+
98102
a {
99103
&:not(.pill):not(.button) {
100104
&:not(:hover) {

assets/styles/ui-components/_pagination.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ $pagination-item-color-hover: $pagination-item-color !default;
44
$pagination-item-color-focus: $pagination-item-color !default;
55

66
$pagination-item-background-color: $secondary !default;
7-
$pagination-item-background-color-hover: opacify($secondary-light, .75) !default;
8-
$pagination-item-background-color-focus: $secondary-light !default;
7+
$pagination-item-background-color-hover: $secondary !default;
8+
$pagination-item-background-color-focus: $secondary !default;
99
$pagination-item-background-color-current: $primary !default;
10-
$pagination-item-background-color-current-hover: $primary-dark !default;
11-
$pagination-item-background-color-current-focus: $primary-dark !default;
10+
$pagination-item-background-color-current-hover: $primary !default;
11+
$pagination-item-background-color-current-focus: $primary !default;
1212

1313
$pagination-item-hover-shadow-size: 0 4px 8px !default;
1414
$pagination-item-hover-shadow-color: rgba(0, 0, 0, .15) !default;

0 commit comments

Comments
 (0)