@primer/css 0.0.0-202192543524 → 0.0.0-20219260536

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (59) hide show
  1. package/CHANGELOG.md +18 -4
  2. package/actionlist/action-list-helpers-temporary.scss +35 -0
  3. package/actionlist/action-list-item-divider.scss +48 -0
  4. package/actionlist/action-list-item.scss +397 -0
  5. package/actionlist/action-list.scss +34 -0
  6. package/actionlist/index.scss +4 -0
  7. package/alerts/flash.scss +9 -0
  8. package/autocomplete/suggester.scss +8 -0
  9. package/buttons/button.scss +5 -5
  10. package/buttons/misc.scss +4 -3
  11. package/core/index.scss +15 -14
  12. package/dist/actionlist.css +2 -0
  13. package/dist/actionlist.css.map +1 -0
  14. package/dist/actionlist.js +1 -0
  15. package/dist/alerts.css +1 -1
  16. package/dist/alerts.css.map +1 -1
  17. package/dist/autocomplete.css +1 -1
  18. package/dist/autocomplete.css.map +1 -1
  19. package/dist/buttons.css +1 -1
  20. package/dist/buttons.css.map +1 -1
  21. package/dist/color-modes.css +1 -1
  22. package/dist/color-modes.css.map +1 -1
  23. package/dist/core.css +1 -1
  24. package/dist/core.css.map +1 -1
  25. package/dist/forms.css +1 -1
  26. package/dist/forms.css.map +1 -1
  27. package/dist/meta.json +34 -38
  28. package/dist/pagination.css +1 -1
  29. package/dist/pagination.css.map +1 -1
  30. package/dist/primer.css +3 -3
  31. package/dist/primer.css.map +1 -1
  32. package/dist/product.css +1 -1
  33. package/dist/product.css.map +1 -1
  34. package/dist/select-menu.css +1 -1
  35. package/dist/select-menu.css.map +1 -1
  36. package/dist/stats/actionlist.json +1 -0
  37. package/dist/stats/alerts.json +1 -1
  38. package/dist/stats/autocomplete.json +1 -1
  39. package/dist/stats/buttons.json +1 -1
  40. package/dist/stats/color-modes.json +1 -1
  41. package/dist/stats/core.json +1 -1
  42. package/dist/stats/forms.json +1 -1
  43. package/dist/stats/pagination.json +1 -1
  44. package/dist/stats/primer.json +1 -1
  45. package/dist/stats/product.json +1 -1
  46. package/dist/stats/select-menu.json +1 -1
  47. package/dist/stats/subhead.json +1 -1
  48. package/dist/stats/toasts.json +1 -1
  49. package/dist/subhead.css +1 -1
  50. package/dist/subhead.css.map +1 -1
  51. package/dist/toasts.css +1 -1
  52. package/dist/toasts.css.map +1 -1
  53. package/forms/form-control.scss +5 -1
  54. package/forms/radio-group.scss +19 -0
  55. package/package.json +4 -4
  56. package/pagination/pagination.scss +1 -1
  57. package/select-menu/select-menu.scss +1 -1
  58. package/subhead/subhead.scss +0 -6
  59. package/toasts/toasts.scss +0 -4
package/CHANGELOG.md CHANGED
@@ -1,15 +1,29 @@
1
1
  # @primer/css
2
2
 
3
- ## 0.0.0-202192543524
3
+ ## 0.0.0-20219260536
4
4
 
5
- ### Patch Changes
5
+ ### Minor Changes
6
6
 
7
- - [#1680](https://github.com/primer/css/pull/1680) [`f013be66`](https://github.com/primer/css/commit/f013be66db59d21d7e2315303b5582169c59c479) Thanks [@privatenumber](https://github.com/privatenumber)! - Fixing broken close span tag in the docs.
7
+ - [#1694](https://github.com/primer/css/pull/1694) [`b0e1687a`](https://github.com/primer/css/commit/b0e1687a562a194ed178fd2dd35588ff5da40847) Thanks [@simurai](https://github.com/simurai)! - Add more Octicon icon support to components
8
8
 
9
- * [#1690](https://github.com/primer/css/pull/1690) [`3c0a65c5`](https://github.com/primer/css/commit/3c0a65c5efdc63352ae88881f2fd6ea3b96ad77c) Thanks [@simurai](https://github.com/simurai)! - Update `Subhead` actions
9
+ ### Patch Changes
10
10
 
11
11
  - Fake entry to force publishing
12
12
 
13
+ * [#1693](https://github.com/primer/css/pull/1693) [`c1ca19d4`](https://github.com/primer/css/commit/c1ca19d4f071a9b12172e4a13bdb96c52a200d47) Thanks [@jasonmacgowan](https://github.com/jasonmacgowan)! - Fix light-theme attr reference in theme docs
14
+
15
+ - [#1689](https://github.com/primer/css/pull/1689) [`257f68f6`](https://github.com/primer/css/commit/257f68f6539539ab809fbdb4351aefa57173e044) Thanks [@adityatheoctocatdev](https://github.com/adityatheoctocatdev)! - Update all Toast variant icons to use `var(--color-fg-on-emphasis)`
16
+
17
+ The only visible change is in the `warning` variant, previously using `var(--color-fg-default)`
18
+
19
+ ## 18.0.2
20
+
21
+ ### Patch Changes
22
+
23
+ - [#1680](https://github.com/primer/css/pull/1680) [`f013be66`](https://github.com/primer/css/commit/f013be66db59d21d7e2315303b5582169c59c479) Thanks [@privatenumber](https://github.com/privatenumber)! - Fixing broken close span tag in the docs.
24
+
25
+ * [#1677](https://github.com/primer/css/pull/1677) [`cdb0faa6`](https://github.com/primer/css/commit/cdb0faa606e6fb35ea4a85dd3866bbb33131b76c) Thanks [@simurai](https://github.com/simurai)! - Lower contrast for disabled text
26
+
13
27
  ## 18.0.1
14
28
 
15
29
  ### Patch Changes
@@ -0,0 +1,35 @@
1
+ // expanded from src/support/variables/layout.scss
2
+ // adds 12px to the scale as of https://github.com/github/design-systems/issues/992
3
+ //
4
+ // https://github.com/github/design-systems/issues/1272
5
+
6
+ $s-20: 20px;
7
+ $s-28: 28px;
8
+
9
+ // CSS Easing
10
+
11
+ $ease-out-expo: cubic-bezier(0.16, 1, 0.3, 1);
12
+ $ease-out-cubic: cubic-bezier(0.33, 1, 0.68, 1);
13
+ $ease-out-quart: cubic-bezier(0.25, 1, 0.5, 1);
14
+ // $actionList-item-padding-vertical: (($spacer-5 - $s-20) / 2); hmmmmm
15
+ $actionList-item-padding-vertical: 6px;
16
+ $actionList-item-padding-horizontal: $spacer-2;
17
+ $actionList-item-bg-transition: background 33.333ms linear; // 2 frames on a 60hz monitor
18
+ $actionList-item-checkmark-transition-timing: 50ms;
19
+
20
+ // waiting on https://github.com/primer/primitives/pull/256 for these primitives
21
+ $actionList-item-hover-bg: #f0f3f5;
22
+ $actionList-item-active-bg: #e8ebed;
23
+ $actionList-item-selected-bg: #f0f3f5;
24
+ $actionList-item-focus-bg: #e0e4e7;
25
+ $actionList-item-divider: #e9e9ed;
26
+ $actionList-item-danger-hover-bg: #fff0f2;
27
+ $actionList-item-danger-active-bg: #ffebed;
28
+ $actionList-item-danger-focus-bg: #ffdbe0;
29
+
30
+ // $actionList-item-padding-vertical: (($spacer-5 - $s-20) / 2); hmmmmm
31
+ $actionList-item-padding-vertical: 6px;
32
+ $actionList-item-padding-horizontal: $spacer-2;
33
+ $actionList-item-bg-transition: background 33.333ms linear; // 2 frames on a 60hz monitor
34
+
35
+ $actionList-padding: $spacer-2;
@@ -0,0 +1,48 @@
1
+ @import './action-list-helpers-temporary.scss';
2
+
3
+ // emtpy divider
4
+
5
+ .ActionList-sectionDivider {
6
+ // has children
7
+ &:not(:empty) {
8
+ padding: (($spacer-5 - $s-20) / 2) $spacer-2;
9
+ font-size: $font-size-small;
10
+ font-weight: $font-weight-bold;
11
+ color: var(--color-fg-muted);
12
+ display: flex;
13
+ flex-direction: column;
14
+ }
15
+
16
+ // no children
17
+ &:empty {
18
+ height: 1px;
19
+ background: $actionList-item-divider;
20
+ border: 0;
21
+ margin: ($spacer-2 - 1px) ($spacer-2 * -1) $spacer-2;
22
+ padding: 0;
23
+ list-style: none;
24
+ }
25
+
26
+ // secondary description text
27
+ .ActionList-sectionDivider--description {
28
+ font-size: $font-size-small;
29
+ font-weight: $font-weight-normal;
30
+ }
31
+ }
32
+
33
+ .ActionList-sectionDivider--filled {
34
+ margin: $spacer-2 ($spacer-2 * -1);
35
+ background: var(--color-canvas-subtle);
36
+ border-top: 1px solid var(--color-scale-gray-2);
37
+ border-bottom: 1px solid var(--color-scale-gray-2);
38
+
39
+ // if no children, treat as divider
40
+ &:empty {
41
+ height: $spacer-2;
42
+ box-sizing: border-box;
43
+ }
44
+
45
+ &:first-child {
46
+ margin-top: 0;
47
+ }
48
+ }
@@ -0,0 +1,397 @@
1
+ @import './action-list-helpers-temporary.scss';
2
+
3
+ @mixin focusOutline {
4
+ outline: none;
5
+ box-shadow: 0 0 0 2px var(--color-accent-fg); // this color breaks convention
6
+ position: relative;
7
+ z-index: 1;
8
+ }
9
+
10
+ // <li>
11
+ .ActionList-item {
12
+ list-style: none;
13
+ position: relative;
14
+ border-radius: $border-radius-2;
15
+
16
+ &:hover,
17
+ &:active {
18
+ cursor: pointer;
19
+
20
+ // a href
21
+ .ActionList-item-content {
22
+ text-decoration: none;
23
+ }
24
+ }
25
+
26
+ // only hover li without list as children
27
+ &:not(.ActionList-item--has-sub-item) {
28
+ &:hover {
29
+ background-color: $actionList-item-hover-bg;
30
+ cursor: pointer;
31
+ }
32
+
33
+ &:active {
34
+ background: $actionList-item-active-bg;
35
+
36
+ @media screen and (prefers-reduced-motion: no-preference) {
37
+ animation: ActionList-item-active-bg 4s forwards $ease-out-cubic;
38
+ }
39
+
40
+ @keyframes ActionList-item-active-bg {
41
+ 0% {
42
+ }
43
+ 50% {
44
+ transform: scale(1);
45
+ box-shadow: inset 0 0 0 rgba(#000, 0.04);
46
+ }
47
+ 100% {
48
+ transform: scale(0.97);
49
+ box-shadow: inset 0 3px 9px rgba(#000, 0.04);
50
+ }
51
+ }
52
+ }
53
+
54
+ &:hover,
55
+ &:active {
56
+ // hide dividers
57
+ .ActionList-item-content--label:before,
58
+ + .ActionList-item .ActionList-item-content--label:before {
59
+ visibility: hidden;
60
+ }
61
+ }
62
+ }
63
+
64
+ // target contents of li if sub-item (li wraps item label + nested ul)
65
+ // collapse styles here
66
+ &.ActionList-item--has-sub-item {
67
+ // first child
68
+ > .ActionList-item-content {
69
+ &:hover {
70
+ background-color: $actionList-item-hover-bg;
71
+ }
72
+ }
73
+ }
74
+
75
+ // active state [aria-current]
76
+
77
+ &.ActionList-item--nav-active:not(.ActionList-item--danger) {
78
+ background: $actionList-item-selected-bg;
79
+ &:before,
80
+ + .ActionList-item:before {
81
+ visibility: hidden;
82
+ }
83
+
84
+ // blue accent line
85
+ &:after {
86
+ content: '';
87
+ width: $spacer-1;
88
+ height: $spacer-4;
89
+ border-radius: $border-radius-1;
90
+ position: absolute;
91
+ left: -$actionList-item-padding-horizontal;
92
+ top: calc(50% - (24px / 2));
93
+ background: var(--color-accent-fg);
94
+ }
95
+ }
96
+
97
+ // collapsible item [aria-expanded]
98
+
99
+ &[aria-expanded='true'] {
100
+ .ActionList-item-content--collapseIcon {
101
+ transform: scaleY(-1);
102
+ transition: transform 120ms linear;
103
+ }
104
+
105
+ .ActionList--sub-group {
106
+ display: block;
107
+ }
108
+
109
+ &.ActionList-item--has-sub-item {
110
+ > .ActionList-item-content > .ActionList-item-content--label {
111
+ font-weight: $font-weight-bold;
112
+ }
113
+ }
114
+ }
115
+
116
+ &[aria-expanded='false'] {
117
+ .ActionList-item-content--collapseIcon {
118
+ transform: scaleY(1);
119
+ transition: transform 120ms linear;
120
+ }
121
+
122
+ .ActionList--sub-group {
123
+ display: none;
124
+ }
125
+ }
126
+
127
+ // checkbox item [aria-checked]
128
+ // listbox [aria-selected]
129
+
130
+ &[aria-checked='true'],
131
+ &[aria-selected='true'] {
132
+ // multiselect checkmark
133
+ .ActionList-item-content--multiSelect-checkmark {
134
+ visibility: visible;
135
+ opacity: 1;
136
+ transition: visibility 0s linear 0s, opacity $actionList-item-checkmark-transition-timing;
137
+ }
138
+
139
+ // singleselect checkmark
140
+ .ActionList-item-content--singleSelect {
141
+ visibility: visible;
142
+
143
+ @media screen and (prefers-reduced-motion: no-preference) {
144
+ animation: checkmarkIn 200ms cubic-bezier(0.11, 0, 0.5, 0) forwards;
145
+ }
146
+ }
147
+
148
+ // checkbox
149
+ .ActionList-item-content--multiSelect {
150
+ .ActionList-item-content--multiSelect-rectangle {
151
+ fill: var(--color-accent-fg);
152
+ stroke: var(--color-accent-fg);
153
+ stroke-width: $border-width;
154
+ }
155
+
156
+ .ActionList-item-content--multiSelect-checkmark {
157
+ fill: var(--color-fg-on-emphasis);
158
+ }
159
+ }
160
+ }
161
+
162
+ &[aria-checked='false'],
163
+ &[aria-selected='false'] {
164
+ // multiselect checkmark
165
+ .ActionList-item-content--multiSelect-checkmark {
166
+ visibility: hidden;
167
+ opacity: 0;
168
+ transition: visibility 0s linear $actionList-item-checkmark-transition-timing,
169
+ opacity $actionList-item-checkmark-transition-timing;
170
+ }
171
+
172
+ // singleselect checkmark
173
+ .ActionList-item-content--singleSelect {
174
+ visibility: hidden;
175
+ clip-path: inset(16px 0 0 0);
176
+ transition: visibility 0s linear 200ms;
177
+
178
+ @media screen and (prefers-reduced-motion: no-preference) {
179
+ animation: checkmarkOut 200ms cubic-bezier(0.11, 0, 0.5, 0) forwards;
180
+ }
181
+ }
182
+
183
+ // checkbox
184
+ .ActionList-item-content--multiSelect {
185
+ .ActionList-item-content--multiSelect-rectangle {
186
+ fill: var(--color-canvas-default);
187
+ stroke: var(--color-border-default);
188
+ stroke-width: $border-width;
189
+ }
190
+ }
191
+
192
+ .ActionList-item-content--multiSelect-rectangle {
193
+ fill: var(--color-canvas-default);
194
+ border: $border-width $border-style var(--color-border-default);
195
+ }
196
+ }
197
+
198
+ @keyframes checkmarkIn {
199
+ from {
200
+ clip-path: inset(16px 0 0 0);
201
+ }
202
+ to {
203
+ clip-path: inset(0 0 0 0);
204
+ }
205
+ }
206
+
207
+ @keyframes checkmarkOut {
208
+ from {
209
+ clip-path: inset(0 0 0 0);
210
+ }
211
+ to {
212
+ clip-path: inset(16px 0 0 0);
213
+ }
214
+ }
215
+
216
+ // variants
217
+
218
+ &.ActionList-item--danger {
219
+ .ActionList-item-content--label {
220
+ color: var(--color-danger-fg);
221
+ }
222
+
223
+ @media (hover: hover) and (pointer: fine) {
224
+ &:hover {
225
+ background: var(--color-danger-subtle);
226
+ }
227
+ }
228
+
229
+ &:active {
230
+ background: var(--color-danger-subtle);
231
+ }
232
+ }
233
+
234
+ // if nested list exists, remove default padding
235
+ .ActionList {
236
+ padding: unset;
237
+ }
238
+ }
239
+
240
+ // span or a href
241
+ .ActionList-item-content {
242
+ display: grid;
243
+ grid-template-rows: minmax(20px, max-content); // 20px + 12px padding [32]
244
+ grid-template-areas: 'leadingAction leadingVisual label trailingVisual trailingAction';
245
+ grid-template-columns: min-content min-content minmax(min-content, auto) min-content min-content;
246
+ align-items: center;
247
+ padding: $actionList-item-padding-vertical $actionList-item-padding-horizontal;
248
+ position: relative;
249
+ border-radius: $border-radius-2;
250
+ font-weight: $font-weight-normal;
251
+ color: var(--color-fg-default);
252
+ user-select: none;
253
+ transition: $actionList-item-bg-transition;
254
+
255
+ // column-gap persists with empty grid-areas, margin applies only when children exist
256
+ & > :not(:last-child) {
257
+ margin-right: $spacer-2;
258
+ }
259
+
260
+ &:focus-visible {
261
+ @include focusOutline;
262
+ }
263
+
264
+ // sizes
265
+
266
+ &.ActionList-item-content--sizeMedium {
267
+ grid-template-rows: minmax(28px, max-content); // 28px + 12px padding [40]
268
+ }
269
+
270
+ &.ActionList-item-content--sizeLarge {
271
+ grid-template-rows: minmax(36px, max-content); // 36px + 12px padding [48]
272
+ }
273
+
274
+ // On pointer:coarse (mobile), all list items are large
275
+ @media (pointer: coarse) {
276
+ grid-template-rows: minmax(36px, max-content);
277
+ }
278
+
279
+ &.ActionList-item-content--blockDescription {
280
+ // if leading/trailing visual, align with first line of content
281
+ .ActionList-item-content--visual {
282
+ place-self: start;
283
+ }
284
+ }
285
+ }
286
+
287
+ // place children on grid
288
+
289
+ .ActionList-item-content--action-leading {
290
+ grid-area: leadingAction;
291
+ }
292
+
293
+ .ActionList-item-content--visual-leading {
294
+ grid-area: leadingVisual;
295
+ }
296
+
297
+ .ActionList-item-content--label {
298
+ grid-area: label;
299
+ }
300
+
301
+ .ActionList-item-content--visual-trailing {
302
+ grid-area: trailingVisual;
303
+ }
304
+
305
+ .ActionList-item-content--action-trailing {
306
+ grid-area: trailingAction;
307
+ }
308
+
309
+ // wrapper span
310
+ .ActionList-item-content--label-blockDescription,
311
+ .ActionList-item-content--label-inlineDescription {
312
+ grid-area: label;
313
+ display: flex;
314
+
315
+ .ActionList-item-content--label {
316
+ font-weight: $font-weight-bold;
317
+ }
318
+ }
319
+
320
+ // block
321
+ .ActionList-item-content--label-blockDescription {
322
+ flex-direction: column;
323
+
324
+ .ActionList-item-content--description {
325
+ margin-top: $spacer-1;
326
+ }
327
+ }
328
+
329
+ // inline
330
+ .ActionList-item-content--label-inlineDescription {
331
+ flex-direction: row;
332
+ align-items: baseline;
333
+
334
+ .ActionList-item-content--description {
335
+ margin-left: $actionList-item-padding-horizontal;
336
+ }
337
+ }
338
+
339
+ // description
340
+ .ActionList-item-content--description {
341
+ font-size: $font-size-small;
342
+ line-height: $lh-default;
343
+ color: var(--color-fg-muted);
344
+ }
345
+
346
+ // helper for grid alignment with multi-line content
347
+ // span wrapping svg or text
348
+ .ActionList-item-content--visual,
349
+ .ActionList-item-content--action {
350
+ min-height: 20px;
351
+ display: flex;
352
+ align-items: center;
353
+ fill: var(--color-fg-muted);
354
+ color: var(--color-fg-muted); // if visual is text
355
+ }
356
+
357
+ // text
358
+ .ActionList-item-content--label {
359
+ font-weight: $font-weight-normal;
360
+ color: var(--color-fg-default);
361
+ position: relative; // for pseudo dividers
362
+ }
363
+
364
+ // nested lists (only supports 1 level currently)
365
+ // target ActionList-item--sub-item for padding-left to maintain :active :after state
366
+
367
+ .ActionList-item--sub-item > .ActionList-item-content {
368
+ font-size: $font-size-small;
369
+ }
370
+
371
+ // no leading visual
372
+ .ActionList--sub-group {
373
+ .ActionList-item--sub-item {
374
+ padding-left: 16px;
375
+ }
376
+ }
377
+
378
+ // has 16px leading visual
379
+ .ActionList-item-content--visual--16 + .ActionList--sub-group {
380
+ .ActionList-item--sub-item {
381
+ padding-left: 24px;
382
+ }
383
+ }
384
+
385
+ // has 20px leading visual
386
+ .ActionList-item-content--visual--20 + .ActionList--sub-group {
387
+ .ActionList-item--sub-item {
388
+ padding-left: 28px;
389
+ }
390
+ }
391
+
392
+ // has 24px leading visual
393
+ .ActionList-item-content--visual--24 + .ActionList--sub-group {
394
+ .ActionList-item--sub-item {
395
+ padding-left: 32px;
396
+ }
397
+ }
@@ -0,0 +1,34 @@
1
+ @import './action-list-helpers-temporary.scss';
2
+
3
+ // <ul>
4
+ .ActionList {
5
+ padding: $actionList-padding;
6
+ }
7
+
8
+ // dividers
9
+
10
+ .ActionList--divided {
11
+ .ActionList-item-content--label:before {
12
+ content: '';
13
+ display: block;
14
+ position: absolute;
15
+ width: 100%;
16
+ height: 1px;
17
+ background: $actionList-item-divider;
18
+ top: -$actionList-item-padding-vertical;
19
+ }
20
+
21
+ // hide divider if item is active
22
+ .ActionList-item--nav-active {
23
+ .ActionList-item-content--label:before,
24
+ + .ActionList-item .ActionList-item-content--label:before {
25
+ visibility: hidden;
26
+ }
27
+ }
28
+ }
29
+
30
+ .ActionList-item:first-of-type .ActionList-item-content--label:before,
31
+ .ActionList-sectionDivider + .ActionList-item .ActionList-item-content--label:before,
32
+ .ActionList-sectionHeader + .ActionList-item .ActionList-item-content--label:before {
33
+ visibility: hidden;
34
+ }
@@ -0,0 +1,4 @@
1
+ @import '../support/index.scss';
2
+ @import './action-list.scss';
3
+ @import './action-list-item.scss';
4
+ @import './action-list-item-divider.scss';
package/alerts/flash.scss CHANGED
@@ -57,6 +57,15 @@
57
57
  margin-top: -3px;
58
58
  margin-left: $spacer-4;
59
59
  background-clip: padding-box;
60
+
61
+ &.btn .octicon {
62
+ margin-right: $spacer-1;
63
+ color: var(--color-fg-muted);
64
+ }
65
+
66
+ &.btn-primary .octicon {
67
+ color: inherit;
68
+ }
60
69
  }
61
70
 
62
71
  //
@@ -46,6 +46,10 @@
46
46
  small {
47
47
  color: var(--color-fg-on-emphasis);
48
48
  }
49
+
50
+ .octicon {
51
+ color: inherit !important;
52
+ }
49
53
  }
50
54
 
51
55
  &[aria-selected="true"],
@@ -57,6 +61,10 @@
57
61
  small {
58
62
  color: var(--color-fg-on-emphasis);
59
63
  }
64
+
65
+ .octicon {
66
+ color: inherit !important;
67
+ }
60
68
  }
61
69
  }
62
70
  }
@@ -26,10 +26,6 @@
26
26
  &.disabled,
27
27
  &[aria-disabled=true] {
28
28
  cursor: default;
29
-
30
- .octicon {
31
- color: var(--color-fg-muted);
32
- }
33
29
  }
34
30
 
35
31
  i {
@@ -96,9 +92,13 @@
96
92
  &:disabled,
97
93
  &.disabled,
98
94
  &[aria-disabled=true] {
99
- color: var(--color-fg-muted);
95
+ color: var(--color-primer-fg-disabled);
100
96
  background-color: var(--color-btn-bg);
101
97
  border-color: var(--color-btn-border);
98
+
99
+ .octicon {
100
+ color: var(--color-primer-fg-disabled);
101
+ }
102
102
  }
103
103
 
104
104
  // Keep :focus after :disabled. Allows to see the focus ring even on disabled buttons
package/buttons/misc.scss CHANGED
@@ -24,7 +24,7 @@
24
24
  &[aria-disabled=true] {
25
25
  &,
26
26
  &:hover {
27
- color: var(--color-fg-muted);
27
+ color: var(--color-primer-fg-disabled);
28
28
  cursor: default;
29
29
  }
30
30
  }
@@ -63,6 +63,7 @@
63
63
  &:disabled,
64
64
  &.disabled,
65
65
  &[aria-disabled=true] {
66
+ color: var(--color-primer-fg-disabled);
66
67
  background-color: transparent;
67
68
  }
68
69
  }
@@ -89,10 +90,10 @@
89
90
 
90
91
  &.disabled,
91
92
  &[aria-disabled=true] {
92
- color: var(--color-fg-muted);
93
+ color: var(--color-primer-fg-disabled);
93
94
  cursor: default;
94
95
 
95
- &:hover { color: var(--color-fg-muted); }
96
+ &:hover { color: var(--color-primer-fg-disabled); }
96
97
  }
97
98
  }
98
99
 
package/core/index.scss CHANGED
@@ -6,23 +6,24 @@
6
6
  */
7
7
 
8
8
  // Global requirements
9
- @import "../support/index.scss";
9
+ @import '../support/index.scss';
10
10
 
11
11
  // Color modes
12
12
 
13
13
  // Core modules
14
- @import "../base/index.scss";
15
- @import "../box/index.scss";
16
- @import "../breadcrumb/index.scss";
17
- @import "../buttons/index.scss";
18
- @import "../table-object/index.scss";
19
- @import "../forms/index.scss";
20
- @import "../layout/index.scss";
21
- @import "../links/index.scss";
22
- @import "../navigation/index.scss";
23
- @import "../pagination/index.scss";
24
- @import "../tooltips/index.scss";
25
- @import "../truncate/index.scss";
14
+ @import '../actionlist/index.scss';
15
+ @import '../base/index.scss';
16
+ @import '../box/index.scss';
17
+ @import '../breadcrumb/index.scss';
18
+ @import '../buttons/index.scss';
19
+ @import '../table-object/index.scss';
20
+ @import '../forms/index.scss';
21
+ @import '../layout/index.scss';
22
+ @import '../links/index.scss';
23
+ @import '../navigation/index.scss';
24
+ @import '../pagination/index.scss';
25
+ @import '../tooltips/index.scss';
26
+ @import '../truncate/index.scss';
26
27
 
27
28
  // Utilities always go last so that they can override components
28
- @import "../utilities/index.scss";
29
+ @import '../utilities/index.scss';