Skip to content

Commit 368013d

Browse files
committed
feat(button): implement new component specs
1 parent 5bdaa8c commit 368013d

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

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

Lines changed: 18 additions & 14 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;
@@ -87,6 +88,7 @@
8788

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

9294
&:hover {
@@ -119,7 +121,7 @@
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

@@ -134,8 +136,9 @@
134136
/// -------------------------------------- ///
135137

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

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

157160
@mixin hxButton-active--secondary {
158-
background-color: $blue-900;
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 {
@@ -167,13 +170,13 @@
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: $blue-700;
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;
189+
border: none;
187190
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;
@@ -222,7 +225,8 @@
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 {

src/scss/components/pill/_index.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ hx-status {
1313
color: $gray-750;
1414
display: inline-block;
1515
font-size: 0.625rem; // 10px
16+
height: 1rem;
17+
line-height: 1;
1618
max-width: 100%;
1719
overflow: hidden;
1820
padding: 0.3em 0.8em 0.2em; // 3px 8px 2px

0 commit comments

Comments
 (0)