Skip to content

Commit 2372b00

Browse files
committed
Update outline + danger button
1 parent c3c0776 commit 2372b00

File tree

1 file changed

+65
-23
lines changed

1 file changed

+65
-23
lines changed

src/buttons/button.scss

Lines changed: 65 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -151,21 +151,21 @@
151151
}
152152
}
153153

154-
// Mixin: btn-inverse-on-hover
154+
// Outline button
155155

156-
@mixin btn-inverse-on-hover($type) {
157-
color: var(--color-btn-#{$type}-text);
156+
.btn-outline {
157+
color: var(--color-btn-outline-text);
158158
transition: none;
159159

160160
&:hover,
161161
[open] > & {
162-
color: var(--color-text-inverse);
163-
background-color: var(--color-btn-#{$type}-bg-hover); // stylelint-disable-line primer/no-undefined-vars
164-
border-color: var(--color-btn-inverse-on-hover-border);
165-
box-shadow: var(--color-btn-inverse-on-hover-shadow), var(--color-btn-inverse-on-hover-shadow-inset);
162+
color: var(--color-btn-outline-hover-text);
163+
background-color: var(--color-btn-outline-hover-bg);
164+
border-color: var(--color-btn-outline-hover-border);
165+
box-shadow: var(--color-btn-outline-hover-shadow), var(--color-btn-outline-hover-inset-shadow);
166166

167167
.Counter {
168-
background-color: var(--color-btn-inverse-on-hover-counter-bg);
168+
background-color: var(--color-btn-outline-hover-counter-bg);
169169
}
170170

171171
.octicon {
@@ -176,45 +176,87 @@
176176
&:active,
177177
&.selected,
178178
&[aria-selected=true] {
179-
color: var(--color-text-inverse);
180-
background-color: var(--color-btn-#{$type}-bg-active); // stylelint-disable-line primer/no-undefined-vars
181-
border-color: var(--color-btn-inverse-on-hover-border);
182-
box-shadow: var(--color-btn-#{$type}-shadow); // stylelint-disable-line primer/no-undefined-vars
179+
color: var(--color-btn-outline-selected-text);
180+
background-color: var(--color-btn-outline-selected-bg);
181+
border-color: var(--color-btn-outline-selected-border);
182+
box-shadow: var(--color-btn-outline-selected-shadow);
183183
}
184184

185185
&:disabled,
186186
&.disabled,
187187
&[aria-disabled=true] {
188-
color: var(--color-btn-#{$type}-text-disabled); // stylelint-disable-line primer/no-undefined-vars
189-
background-color: var(--color-bg-secondary);
188+
color: var(--color-btn-outline-disabled-text);
189+
background-color: var(--color-btn-bg);
190190
border-color: var(--color-btn-border);
191-
box-shadow: var(--color-shadow-small), var(--color-shadow-highlight);
191+
box-shadow: none;
192192

193193
.Counter {
194-
background-color: var(--color-btn-#{$type}-counter-bg-disabled); // stylelint-disable-line primer/no-undefined-vars
194+
background-color: var(--color-btn-outline-disabled-counter-bg);
195195
}
196196
}
197197

198198
&:focus {
199-
box-shadow: var(--color-btn-#{$type}-shadow-focus); // stylelint-disable-line primer/no-undefined-vars
199+
box-shadow: var(--color-btn-outline-focus-shadow);
200200
}
201201

202202
.Counter {
203203
color: inherit;
204-
background-color: var(--color-btn-#{$type}-counter-bg); // stylelint-disable-line primer/no-undefined-vars
204+
background-color: var(--color-btn-outline-counter-bg);
205205
}
206206
}
207207

208208
// Danger button
209209

210210
.btn-danger {
211-
@include btn-inverse-on-hover("danger");
212-
}
211+
color: var(--color-btn-danger-text);
212+
transition: none;
213213

214-
// Outline button
214+
&:hover,
215+
[open] > & {
216+
color: var(--color-btn-danger-hover-text);
217+
background-color: var(--color-btn-danger-hover-bg);
218+
border-color: var(--color-btn-danger-hover-border);
219+
box-shadow: var(--color-btn-danger-hover-shadow), var(--color-btn-danger-hover-inset-shadow);
215220

216-
.btn-outline {
217-
@include btn-inverse-on-hover("outline");
221+
.Counter {
222+
background-color: var(--color-btn-danger-hover-counter-bg);
223+
}
224+
225+
.octicon {
226+
color: inherit;
227+
}
228+
}
229+
230+
&:active,
231+
&.selected,
232+
&[aria-selected=true] {
233+
color: var(--color-btn-danger-selected-text);
234+
background-color: var(--color-btn-danger-selected-bg);
235+
border-color: var(--color-btn-danger-selected-border);
236+
box-shadow: var(--color-btn-danger-selected-shadow);
237+
}
238+
239+
&:disabled,
240+
&.disabled,
241+
&[aria-disabled=true] {
242+
color: var(--color-btn-danger-disabled-text);
243+
background-color: var(--color-btn-bg);
244+
border-color: var(--color-btn-border);
245+
box-shadow: none;
246+
247+
.Counter {
248+
background-color: var(--color-btn-danger-disabled-counter-bg);
249+
}
250+
}
251+
252+
&:focus {
253+
box-shadow: var(--color-btn-danger-focus-shadow);
254+
}
255+
256+
.Counter {
257+
color: inherit;
258+
background-color: var(--color-btn-danger-counter-bg);
259+
}
218260
}
219261

220262
// Sizes

0 commit comments

Comments
 (0)