Skip to content

Commit 4efae45

Browse files
committed
TMS-1164: Button hover style changes
1 parent a831488 commit 4efae45

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

assets/styles/helpers/_button.scss

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -257,14 +257,14 @@ $button-transition-speed: $speed !default;
257257
&,
258258
&:active,
259259
&.is-active {
260-
// @include button_colors($btn-pair-primary, $btn-pair-primary-text-invert, $btn-pair-primary);
260+
@include button_colors($btn-pair-primary, $btn-pair-primary-text-invert, $btn-pair-primary);
261261
}
262262

263263
&:hover,
264264
&.is-hovered,
265265
&:focus,
266266
&.is-focused {
267-
// @include button_colors($btn-pair-primary-text, $btn-pair-primary-invert, $btn-pair-primary);
267+
@include button_colors($btn-pair-primary, $btn-pair-primary-text-invert, $btn-pair-primary);
268268
}
269269

270270
@extend .button-states;
@@ -273,13 +273,13 @@ $button-transition-speed: $speed !default;
273273
&,
274274
&:active,
275275
&.is-active {
276-
// @include button_colors(transparent, $btn-pair-primary, $btn-pair-primary);
276+
@include button_colors(transparent, $btn-pair-primary, $btn-pair-primary);
277277
}
278278

279279
&:hover,
280280
&:focus,
281281
&.is-hovered {
282-
// @include button_colors(transparent, $btn-pair-primary, $btn-pair-primary);
282+
@include button_colors(transparent, $btn-pair-primary, $btn-pair-primary);
283283
}
284284

285285
@extend .button-states;
@@ -288,8 +288,11 @@ $button-transition-speed: $speed !default;
288288
&.is-borderless {
289289
&,
290290
&:active,
291-
&.is-active {
292-
// @include button_colors($btn-pair-primary, $btn-pair-primary-text-invert, transparent);
291+
&.is-active,
292+
&:hover,
293+
&:focus,
294+
&.is-hovered {
295+
@include button_colors($btn-pair-primary, $btn-pair-primary-text-invert, transparent);
293296
border-color: transparent !important;
294297
}
295298

@@ -301,14 +304,14 @@ $button-transition-speed: $speed !default;
301304
&,
302305
&:active,
303306
&.is-active {
304-
// @include button_colors($btn-pair-primary-invert, $btn-pair-primary-text, $btn-pair-primary-invert);
307+
@include button_colors($btn-pair-primary-invert, $btn-pair-primary-text, $btn-pair-primary-invert);
305308
}
306309

307310
&:hover,
308311
&.is-hovered,
309312
&:focus,
310313
&.is-focused {
311-
// @include button_colors($btn-pair-primary-text-invert, $btn-pair-primary, $btn-pair-primary-invert);
314+
@include button_colors($btn-pair-primary-invert, $btn-pair-primary-text, $btn-pair-primary-invert);
312315
}
313316

314317
@extend .button-states;
@@ -317,13 +320,13 @@ $button-transition-speed: $speed !default;
317320
&,
318321
&:active,
319322
&.is-active {
320-
// @include button_colors(transparent, $btn-pair-primary-text-invert, $btn-pair-primary-text-invert);
323+
@include button_colors(transparent, $btn-pair-primary-text-invert, $btn-pair-primary-text-invert);
321324
}
322325

323326
&:hover,
324327
&:focus,
325328
&.is-hovered {
326-
// @include button_colors($btn-pair-primary-text, $btn-pair-primary-invert, $btn-pair-primary-invert);
329+
@include button_colors(transparent, $btn-pair-primary-text-invert, $btn-pair-primary-text-invert);
327330
}
328331

329332
@extend .button-states;
@@ -340,7 +343,7 @@ $button-transition-speed: $speed !default;
340343
&:hover,
341344
&:focus,
342345
&.is-hovered {
343-
// @include button_colors($btn-pair-primary-text-invert, $btn-pair-primary, transparent);
346+
@include button_colors($btn-pair-primary-invert, $btn-pair-primary-text, transparent);
344347
}
345348

346349
@extend .button-states;

assets/styles/ui-components/_pill.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ $pill-hover-shadow-color: rgba(0, 0, 0, .15) !default;
9292
&.is-active {
9393
color: $pill-color-active;
9494
background-color: $pill-background-active;
95+
96+
&:hover {
97+
color: $pill-color-active;
98+
}
9599
}
96100

97101
&.is-outlined {

0 commit comments

Comments
 (0)