|
23 | 23 | }
|
24 | 24 | }
|
25 | 25 |
|
26 |
| -@mixin pseudo-states($hover-bg-color, $active-bg-color) { |
| 26 | +@mixin pseudo-states($hover-bg-color, $active-bg-color, $hover-border-color: null) { |
27 | 27 | $parent-selector: &;
|
28 | 28 |
|
29 | 29 | &:hover:enabled {
|
30 | 30 | background: $hover-bg-color;
|
| 31 | + |
| 32 | + @if ($hover-border-color) { |
| 33 | + border-color: $hover-border-color; |
| 34 | + } |
31 | 35 | }
|
32 | 36 |
|
33 | 37 | &:active:enabled {
|
|
62 | 66 | }
|
63 | 67 |
|
64 | 68 | &--warning {
|
65 |
| - $text-color: var(--N900); |
66 |
| - |
67 |
| - @include button-variant-styles(var(--Y500), $text-color, $border-color); |
| 69 | + @include button-variant-styles(var(--Y500), var(--N900), $border-color); |
68 | 70 | @include pseudo-states(var(--Y600), var(--Y700));
|
69 | 71 | }
|
70 | 72 |
|
71 | 73 | &--neutral {
|
72 |
| - @include button-variant-styles(var(--N500), $text-color, $border-color); |
73 |
| - @include pseudo-states(var(--N600), var(--N700)); |
| 74 | + @include button-variant-styles(var(--N600), $text-color, $border-color); |
| 75 | + @include pseudo-states(var(--N700), var(--N800)); |
74 | 76 | }
|
75 | 77 | }
|
76 | 78 |
|
|
80 | 82 |
|
81 | 83 | &--default {
|
82 | 84 | @include button-variant-styles($background, var(--B500), $border-color);
|
83 |
| - @include pseudo-states(var(--B100), var(--B200)); |
| 85 | + @include pseudo-states(var(--B100), var(--B200), var(--B500)); |
84 | 86 | }
|
85 | 87 |
|
86 | 88 | &--negative {
|
87 | 89 | @include button-variant-styles($background, var(--R600), $border-color);
|
88 |
| - @include pseudo-states(var(--R100), var(--R200)); |
| 90 | + @include pseudo-states(var(--R100), var(--R200), var(--R600)); |
89 | 91 | }
|
90 | 92 |
|
91 | 93 | &--positive {
|
92 | 94 | @include button-variant-styles($background, var(--G600), $border-color);
|
93 |
| - @include pseudo-states(var(--G100), var(--G200)); |
| 95 | + @include pseudo-states(var(--G100), var(--G200), var(--G600)); |
94 | 96 | }
|
95 | 97 |
|
96 | 98 | &--warning {
|
97 | 99 | @include button-variant-styles($background, var(--Y700), $border-color);
|
98 |
| - @include pseudo-states(var(--Y100), var(--Y200)); |
| 100 | + @include pseudo-states(var(--Y100), var(--Y200), var(--Y700)); |
99 | 101 | }
|
100 | 102 |
|
101 | 103 | &--neutral {
|
102 | 104 | @include button-variant-styles($background, var(--N700), $border-color);
|
103 |
| - @include pseudo-states(var(--N100), var(--N200)); |
| 105 | + @include pseudo-states(var(--N100), var(--N200), var(--N700)); |
104 | 106 | }
|
105 | 107 | }
|
106 | 108 |
|
|
173 | 175 | }
|
174 | 176 |
|
175 | 177 | // Hide the visibility for the button child elements when loading is true
|
176 |
| - &--loading>* { |
177 |
| - visibility: hidden; |
| 178 | + &--loading { |
| 179 | + opacity: 1; |
| 180 | + |
| 181 | + &>* { |
| 182 | + visibility: hidden; |
| 183 | + } |
178 | 184 | }
|
179 | 185 | }
|
0 commit comments