Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/little-books-talk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/css": major
---

Using stylelint to replace deprecated variables in primer/css
36 changes: 18 additions & 18 deletions src/alerts/flash.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,46 +64,46 @@
//

.flash {
color: var(--color-alert-info-text);
background-image: linear-gradient(var(--color-alert-info-bg), var(--color-alert-info-bg));
border-color: var(--color-alert-info-border);
color: var(--color-fg-default);
background-image: linear-gradient(var(--color-accent-subtle), var(--color-accent-subtle));
border-color: var(--color-accent-muted);

.octicon {
// stylelint-disable-next-line primer/colors
color: var(--color-alert-info-icon);
color: var(--color-accent-fg);
}
}

.flash-warn {
color: var(--color-alert-warn-text);
background-image: linear-gradient(var(--color-alert-warn-bg), var(--color-alert-warn-bg));
border-color: var(--color-alert-warn-border);
color: var(--color-fg-default);
background-image: linear-gradient(var(--color-attention-subtle), var(--color-attention-subtle));
border-color: var(--color-attention-muted);

.octicon {
// stylelint-disable-next-line primer/colors
color: var(--color-alert-warn-icon);
color: var(--color-attention-fg);
}
}

.flash-error {
color: var(--color-alert-error-text);
background-image: linear-gradient(var(--color-alert-error-bg), var(--color-alert-error-bg));
border-color: var(--color-alert-error-border);
color: var(--color-fg-default);
background-image: linear-gradient(var(--color-danger-subtle), var(--color-danger-subtle));
border-color: var(--color-danger-muted);

.octicon {
// stylelint-disable-next-line primer/colors
color: var(--color-alert-error-icon);
color: var(--color-danger-fg);
}
}

.flash-success {
color: var(--color-alert-success-text);
background-image: linear-gradient(var(--color-alert-success-bg), var(--color-alert-success-bg));
border-color: var(--color-alert-success-border);
color: var(--color-fg-default);
background-image: linear-gradient(var(--color-success-subtle), var(--color-success-subtle));
border-color: var(--color-success-muted);

.octicon {
// stylelint-disable-next-line primer/colors
color: var(--color-alert-success-icon);
color: var(--color-success-fg);
}
}

Expand Down Expand Up @@ -133,7 +133,7 @@
// Makes sure the background is opaque to cover any content underneath
.flash-full,
.flash-banner {
background-color: var(--color-bg-canvas);
background-color: var(--color-canvas-default);
}

// FIXME deprecate this
Expand All @@ -142,5 +142,5 @@
// stylelint-disable-next-line primer/spacing
margin-bottom: 0.8em;
font-weight: $font-weight-bold;
background-color: var(--color-alert-warn-bg);
background-color: var(--color-attention-subtle);
}
14 changes: 7 additions & 7 deletions src/autocomplete/autocomplete.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
// stylelint-disable-next-line primer/typography
font-size: 13px;
list-style: none;
background: var(--color-bg-overlay);
border: $border-width $border-style var(--color-border-primary);
background: var(--color-primer-canvas-backdrop);
border: $border-width $border-style var(--color-border-default);
border-radius: $border-radius;
box-shadow: var(--color-autocomplete-shadow);
box-shadow: var(--color-shadow-medium);
}

// One of the items that appears within an autocomplete group
Expand All @@ -23,19 +23,19 @@
padding: $spacer-1 $spacer-2;
overflow: hidden;
font-weight: $font-weight-bold;
color: var(--color-text-primary);
color: var(--color-fg-default);
text-align: left;
text-decoration: none;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
background-color: var(--color-bg-overlay);
background-color: var(--color-primer-canvas-backdrop);
border: 0;

&:hover {
color: var(--color-state-hover-primary-text);
color: var(--color-fg-on-emphasis);
text-decoration: none;
background-color: var(--color-state-hover-primary-bg);
background-color: var(--color-accent-emphasis);

// Inherit color on all child elements to ensure enough contrast
* {
Expand Down
16 changes: 8 additions & 8 deletions src/autocomplete/suggester.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
margin-top: $spacer-4;
list-style: none;
cursor: pointer;
background: var(--color-bg-overlay);
border: $border-width $border-style var(--color-border-primary);
background: var(--color-primer-canvas-backdrop);
border: $border-width $border-style var(--color-border-default);
border-radius: $border-radius;
box-shadow: var(--color-autocomplete-shadow);
box-shadow: var(--color-shadow-medium);

li {
display: block;
padding: $spacer-1 $spacer-2;
font-weight: $font-weight-semibold;
border-bottom: $border-width $border-style var(--color-autocomplete-row-border);
border-bottom: $border-width $border-style var(--color-border-muted);

small {
font-weight: $font-weight-normal;
color: var(--color-text-secondary);
color: var(--color-fg-muted);
}

&:last-child {
Expand All @@ -39,12 +39,12 @@
}

&:hover {
color: var(--color-state-hover-primary-text);
color: var(--color-fg-on-emphasis);
text-decoration: none;
background: var(--color-state-hover-primary-bg);
background: var(--color-accent-emphasis);

small {
color: var(--color-state-hover-primary-text);
color: var(--color-fg-on-emphasis);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/avatars/avatar-parent-child.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
position: absolute;
right: -15%;
bottom: -9%;
background-color: var(--color-bg-canvas); // For transparent backgrounds
background-color: var(--color-canvas-default); // For transparent backgrounds
// stylelint-disable-next-line primer/borders
border-radius: $border-radius-1;
box-shadow: var(--color-avatar-child-shadow);
Expand Down
14 changes: 7 additions & 7 deletions src/avatars/avatar-stack.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

.AvatarStack-body {
display: flex;
background: var(--color-bg-canvas);
background: var(--color-canvas-default);

.avatar {
position: relative;
Expand All @@ -32,8 +32,8 @@
box-sizing: content-box;
// stylelint-disable-next-line primer/spacing
margin-right: -11px;
background-color: var(--color-bg-canvas);
border-right: $border-width $border-style var(--color-bg-canvas); // stylelint-disable-line primer/borders
background-color: var(--color-canvas-default);
border-right: $border-width $border-style var(--color-canvas-default); // stylelint-disable-line primer/borders
// stylelint-disable-next-line primer/borders
border-radius: $border-radius-1;
transition: margin 0.1s ease-in-out;
Expand Down Expand Up @@ -82,7 +82,7 @@
.avatar.avatar-more {
z-index: 1;
margin-right: 0;
background: var(--color-bg-tertiary);
background: var(--color-canvas-subtle);

&::before,
&::after {
Expand All @@ -92,7 +92,7 @@
content: "";
// stylelint-disable-next-line primer/borders
border-radius: 2px;
outline: $border-width $border-style var(--color-bg-canvas);
outline: $border-width $border-style var(--color-canvas-default);
}

&::before {
Expand Down Expand Up @@ -132,7 +132,7 @@

&::after {
width: 2px;
background: var(--color-bg-tertiary);
background: var(--color-canvas-subtle);
}
}

Expand All @@ -141,6 +141,6 @@
// stylelint-disable-next-line primer/spacing
margin-left: -11px;
border-right: 0;
border-left: $border-width $border-style var(--color-bg-canvas); // stylelint-disable-line primer/borders
border-left: $border-width $border-style var(--color-canvas-default); // stylelint-disable-line primer/borders
}
}
4 changes: 2 additions & 2 deletions src/avatars/circle-badge.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
display: flex;
align-items: center;
justify-content: center;
background-color: var(--color-bg-canvas);
background-color: var(--color-canvas-default);
border-radius: 50%;
box-shadow: var(--color-shadow-medium);
}
Expand Down Expand Up @@ -46,7 +46,7 @@
width: 100%;
content: "";
// stylelint-disable-next-line primer/borders
border-bottom: 2px dashed var(--color-border-primary);
border-bottom: 2px dashed var(--color-border-default);
}

.CircleBadge {
Expand Down
8 changes: 4 additions & 4 deletions src/base/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ body {
font-family: $body-font;
font-size: $body-font-size;
line-height: $body-line-height;
color: var(--color-text-primary);
background-color: var(--color-bg-canvas);
color: var(--color-fg-default);
background-color: var(--color-canvas-default);
}

a {
color: var(--color-text-link);
color: var(--color-accent-fg);
text-decoration: none;

&:hover {
Expand All @@ -45,7 +45,7 @@ hr,
overflow: hidden;
background: transparent;
border: 0;
border-bottom: $border-width $border-style var(--color-border-secondary);
border-bottom: $border-width $border-style var(--color-border-muted);
@include clearfix();
}

Expand Down
4 changes: 2 additions & 2 deletions src/base/kbd.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ kbd {
font: 11px $mono-font;
// stylelint-disable-next-line primer/typography
line-height: 10px;
color: var(--color-text-primary);
color: var(--color-fg-default);
vertical-align: middle;
background-color: var(--color-bg-secondary);
background-color: var(--color-canvas-subtle);
// stylelint-disable-next-line primer/borders
border: $border-style $border-width var(--color-border-tertiary);
border-bottom-color: var(--color-border-tertiary);
Expand Down
4 changes: 2 additions & 2 deletions src/base/modes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
// Enables nesting of different color modes

[data-color-mode] {
color: var(--color-text-primary);
background-color: var(--color-bg-canvas);
color: var(--color-fg-default);
background-color: var(--color-canvas-default);
}

// color-scheme
Expand Down
8 changes: 4 additions & 4 deletions src/blankslate/blankslate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
text-align: center;

p {
color: var(--color-text-secondary);
color: var(--color-fg-muted);
}

code {
// stylelint-disable-next-line primer/spacing
padding: 2px 5px 3px;
font-size: $h5-size;
background: var(--color-bg-canvas);
border: $border-width $border-style var(--color-border-secondary);
background: var(--color-canvas-default);
border: $border-width $border-style var(--color-border-muted);
border-radius: $border-radius;
}

Expand All @@ -28,7 +28,7 @@
margin-bottom: $spacer-2;
margin-left: $spacer-1;
// stylelint-disable-next-line primer/colors
color: var(--color-icon-secondary);
color: var(--color-fg-muted);
}

.blankslate-capped {
Expand Down
Loading