Skip to content

Commit da91aa9

Browse files
committed
TMS-1164: Button hover styles
1 parent f8d7866 commit da91aa9

File tree

3 files changed

+43
-26
lines changed

3 files changed

+43
-26
lines changed

assets/styles/settings/_settings.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ $colors: (
77
) !default;
88

99
$button-colors: (
10-
"primary": ($primary, $color-white, $text, $text),
11-
"secondary": ($secondary, $secondary-invert, $color-white, $color-black),
10+
"primary": ($black, $white, $black, $white),
11+
"secondary": ($black, $color-white, $black, $color-white),
1212
) !default;
1313

1414
$navbar-colors: (

assets/styles/settings/brand/_typography.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ h4,
160160
$link-outline-color: $color-milavida-black;
161161

162162
main {
163-
a:not(.pill):not(.button) {
163+
a:not(.pill):not(.button):not(.post-link) {
164164
text-underline-offset: .125rem;
165165

166166
&:focus {

assets/styles/ui-components/_button.scss

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,50 +37,67 @@ $button-secondary-border-color: $button-primary-border-color;
3737
}
3838

3939
&.is-primary {
40-
background-color: $primary !important;
41-
color: $primary-invert !important;
42-
border-color: $primary-invert !important;
43-
40+
&,
4441
&:hover,
45-
&:focus {
46-
color: $primary-invert !important;
42+
&.is-hovered,
43+
&:focus,
44+
&.is-focused,
45+
&:active {
4746
background-color: $primary !important;
47+
color: $primary-invert !important;
4848
border-color: $primary-invert !important;
4949

5050
.icon {
5151
fill: $primary-invert !important;
5252
}
5353
}
54-
55-
.icon {
56-
fill: $primary-invert !important;
57-
}
5854
}
5955

6056
&.is-primary.is-inverted,
6157
&.is-primary-invert {
62-
border-color: $primary !important;
63-
background-color: $primary-invert !important;
64-
color: $primary !important;
58+
&,
59+
&:hover,
60+
&.is-hovered,
61+
&:focus,
62+
&.is-focused,
63+
&:active {
64+
border-color: $primary !important;
65+
background-color: $primary-invert !important;
66+
color: $primary !important;
6567

66-
.icon {
67-
fill: currentColor !important;
68-
color: inherit;
68+
.icon {
69+
fill: currentColor !important;
70+
color: inherit;
71+
}
6972
}
7073
}
7174

7275
&.is-secondary {
73-
background-color: $primary-invert !important;
74-
color: $primary !important;
76+
&,
77+
&:hover,
78+
&.is-hovered,
79+
&:focus,
80+
&.is-focused,
81+
&:active {
82+
background-color: $primary-invert !important;
83+
color: $primary !important;
7584

76-
.icon {
77-
fill: currentColor !important;
85+
.icon {
86+
fill: currentColor !important;
87+
}
7888
}
7989
}
8090

8191
&.is-outlined {
82-
border-color: $primary-invert !important;
83-
background-color: transparent !important;
84-
color: $primary-invert !important;
92+
&,
93+
&:hover,
94+
&.is-hovered,
95+
&:focus,
96+
&.is-focused,
97+
&:active {
98+
border-color: $primary-invert !important;
99+
background-color: transparent !important;
100+
color: $primary-invert !important;
101+
}
85102
}
86103
}

0 commit comments

Comments
 (0)