Skip to content

Commit fa1fa7e

Browse files
committed
fix: opacity for loading, hover for secondary and primary neutral
1 parent 504a7eb commit fa1fa7e

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

src/Shared/Components/Button/button.scss

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,15 @@
2323
}
2424
}
2525

26-
@mixin pseudo-states($hover-bg-color, $active-bg-color) {
26+
@mixin pseudo-states($hover-bg-color, $active-bg-color, $hover-border-color: null) {
2727
$parent-selector: &;
2828

2929
&:hover:enabled {
3030
background: $hover-bg-color;
31+
32+
@if ($hover-border-color) {
33+
border-color: $hover-border-color;
34+
}
3135
}
3236

3337
&:active:enabled {
@@ -62,15 +66,13 @@
6266
}
6367

6468
&--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);
6870
@include pseudo-states(var(--Y600), var(--Y700));
6971
}
7072

7173
&--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));
7476
}
7577
}
7678

@@ -80,27 +82,27 @@
8082

8183
&--default {
8284
@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));
8486
}
8587

8688
&--negative {
8789
@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));
8991
}
9092

9193
&--positive {
9294
@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));
9496
}
9597

9698
&--warning {
9799
@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));
99101
}
100102

101103
&--neutral {
102104
@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));
104106
}
105107
}
106108

@@ -173,7 +175,11 @@
173175
}
174176

175177
// 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+
}
178184
}
179185
}

0 commit comments

Comments
 (0)