Skip to content

Commit 7fc23e4

Browse files
authored
Merge pull request #821 from BY00565233/SURF-2152
feat(button): new component specs
2 parents ecd4b6b + 368013d commit 7fc23e4

File tree

2 files changed

+30
-26
lines changed

2 files changed

+30
-26
lines changed

src/scss/components/button/mixins/_hxButton.scss

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
cursor: pointer;
3636
display: inline-block;
3737
font: inherit;
38-
font-weight: 500;
38+
font-size: 0.875rem;
39+
font-weight: 700; // bold
3940
line-height: 1;
4041
margin: 0;
4142
padding: 0;
@@ -86,7 +87,8 @@
8687
/// ------------------------------------ ///
8788

8889
@mixin hxButton--primary {
89-
background-color: $cyan-900;
90+
background-color: $blue-500;
91+
border: none;
9092
color: $gray-0;
9193

9294
&:hover {
@@ -107,24 +109,24 @@
107109
}
108110

109111
@mixin hxButton-active--primary {
110-
background-color: $cyan-700;
112+
background-color: $blue-900;
111113
border-color: transparent;
112114
color: $gray-0;
113115
}
114116

115117
@mixin hxButton-disabled--primary {
116-
background-color: $gray-400;
118+
background-color: $gray-500;
117119
border-color: transparent;
118-
color: $gray-700;
120+
color: $gray-0;
119121
}
120122

121123
@mixin hxButton-focus--primary {
122-
box-shadow: $focus-glow;
124+
box-shadow: 0 0 4px rgba($blue-700, 0.5);
123125
outline: none;
124126
}
125127

126128
@mixin hxButton-hover--primary {
127-
background-color: $cyan-500;
129+
background-color: $blue-700;
128130
border-color: transparent;
129131
color: $gray-0;
130132
}
@@ -134,8 +136,9 @@
134136
/// -------------------------------------- ///
135137

136138
@mixin hxButton--secondary {
137-
border: 1px solid $cyan-900;
138-
color: $cyan-900;
139+
background-color: transparent;
140+
border: 1px solid $blue-500;
141+
color: $blue-500;
139142

140143
&:hover {
141144
@include hxButton-hover--secondary;
@@ -155,25 +158,25 @@
155158
}
156159

157160
@mixin hxButton-active--secondary {
158-
background-color: $cyan-700;
159-
border-color: transparent;
160-
color: $gray-0;
161+
background-color: transparent;
162+
border: 1px solid $blue-900;
163+
color: $blue-900;
161164
}
162165

163166
@mixin hxButton-disabled--secondary {
164167
background-color: transparent;
165-
border-color: $gray-400;
166-
color: $gray-400;
168+
border: 1px solid $gray-500;
169+
color: $gray-500;
167170
}
168171

169172
@mixin hxButton-focus--secondary {
170-
box-shadow: $focus-glow;
173+
box-shadow: 0 0 4px rgba($blue-700, 0.5);
171174
}
172175

173176
@mixin hxButton-hover--secondary {
174-
background-color: $cyan-500;
175-
border-color: transparent;
176-
color: $gray-0;
177+
background-color: transparent;
178+
border: 1px solid $blue-700;
179+
color: $blue-700;
177180
}
178181

179182

@@ -183,10 +186,10 @@
183186

184187
@mixin hxButton--tertiary {
185188
background-color: transparent;
186-
border: 0;
187-
color: $cyan-900;
189+
border: none;
190+
color: $blue-500;
188191

189-
// This class will be removed in HelixUI-v1.0.0.
192+
// TODO: deprecated Button and Button Bar styles
190193
&.hxDeprecated {
191194
padding-left: 0;
192195
padding-right: 0;
@@ -212,21 +215,22 @@
212215
@mixin hxButton-active--tertiary {
213216
background-color: transparent;
214217
border-color: transparent;
215-
color: $cyan-700;
218+
color: $blue-900;
216219
}
217220

218221
@mixin hxButton-disabled--tertiary {
219222
background-color: transparent;
220223
border-color: transparent;
221-
color: $gray-400;
224+
color: $gray-500;
222225
}
223226

224227
@mixin hxButton-focus--tertiary {
225-
box-shadow: $focus-glow;
228+
box-shadow: 0 0 4px rgba($blue-700, 0.5);
229+
outline: none;
226230
}
227231

228232
@mixin hxButton-hover--tertiary {
229233
background-color: transparent;
230234
border-color: transparent;
231-
color: $cyan-500;
235+
color: $blue-700;
232236
}

src/scss/components/popover/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ hx-popover {
3939
color: $gray-900;
4040
flex-shrink: 0;
4141
font-size: 1rem;
42-
font-weight: 500;
42+
font-weight: 600;
4343
padding: map-get($space, md);
4444
text-transform: none;
4545
}

0 commit comments

Comments
 (0)