diff --git a/package.json b/package.json index 8c0e504365..e0bbaf5dfc 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ ], "scripts": { "dist": "script/dist.js", - "stylelint": "stylelint --quiet src/**/*.scss", + "stylelint": "stylelint --quiet 'src/**/*.scss'", "eslint": "eslint deprecations.js __tests__ script", "prepublishOnly": "script/prepublish", "start": "yarn dev", diff --git a/src/color-modes/themes/dark.scss b/src/color-modes/themes/dark.scss index 51e837bfd0..5390a9e541 100644 --- a/src/color-modes/themes/dark.scss +++ b/src/color-modes/themes/dark.scss @@ -1,6 +1,6 @@ -@import "../../support/index.scss"; +@import '../../support/index.scss'; -@import "@primer/primitives/dist/scss/colors/_dark.scss"; +@import '@primer/primitives/dist/scss/colors/_dark.scss'; @include color-mode-theme(dark) { @include primer-colors-dark; diff --git a/src/color-modes/themes/dark_colorblind.scss b/src/color-modes/themes/dark_colorblind.scss index d1b7442b73..0163491928 100644 --- a/src/color-modes/themes/dark_colorblind.scss +++ b/src/color-modes/themes/dark_colorblind.scss @@ -1,6 +1,6 @@ -@import "../../support/index.scss"; +@import '../../support/index.scss'; -@import "@primer/primitives/dist/scss/colors/_dark_colorblind.scss"; +@import '@primer/primitives/dist/scss/colors/_dark_colorblind.scss'; @include color-mode-theme(dark_colorblind) { @include primer-colors-dark_colorblind; diff --git a/src/color-modes/themes/dark_dimmed.scss b/src/color-modes/themes/dark_dimmed.scss index 03671f17c9..04fff33933 100644 --- a/src/color-modes/themes/dark_dimmed.scss +++ b/src/color-modes/themes/dark_dimmed.scss @@ -1,6 +1,6 @@ -@import "../../support/index.scss"; +@import '../../support/index.scss'; -@import "@primer/primitives/dist/scss/colors/_dark_dimmed.scss"; +@import '@primer/primitives/dist/scss/colors/_dark_dimmed.scss'; @include color-mode-theme(dark_dimmed) { @include primer-colors-dark_dimmed; diff --git a/src/color-modes/themes/dark_high_contrast.scss b/src/color-modes/themes/dark_high_contrast.scss index d76816425a..c1a46d227d 100644 --- a/src/color-modes/themes/dark_high_contrast.scss +++ b/src/color-modes/themes/dark_high_contrast.scss @@ -1,6 +1,6 @@ -@import "../../support/index.scss"; +@import '../../support/index.scss'; -@import "@primer/primitives/dist/scss/colors/_dark_high_contrast.scss"; +@import '@primer/primitives/dist/scss/colors/_dark_high_contrast.scss'; @include color-mode-theme(dark_high_contrast) { @include primer-colors-dark_high_contrast; diff --git a/src/color-modes/themes/light.scss b/src/color-modes/themes/light.scss index 02f081b781..5190756d26 100644 --- a/src/color-modes/themes/light.scss +++ b/src/color-modes/themes/light.scss @@ -1,6 +1,6 @@ -@import "../../support/index.scss"; +@import '../../support/index.scss'; -@import "@primer/primitives/dist/scss/colors/_light.scss"; +@import '@primer/primitives/dist/scss/colors/_light.scss'; @include color-mode-theme(light, true) { @include primer-colors-light; diff --git a/src/color-modes/themes/light_colorblind.scss b/src/color-modes/themes/light_colorblind.scss index e087705317..64ad6b2f87 100644 --- a/src/color-modes/themes/light_colorblind.scss +++ b/src/color-modes/themes/light_colorblind.scss @@ -1,6 +1,6 @@ -@import "../../support/index.scss"; +@import '../../support/index.scss'; -@import "@primer/primitives/dist/scss/colors/_light_colorblind.scss"; +@import '@primer/primitives/dist/scss/colors/_light_colorblind.scss'; @include color-mode-theme(light_colorblind) { @include primer-colors-light_colorblind; diff --git a/src/color-modes/themes/light_high_contrast.scss b/src/color-modes/themes/light_high_contrast.scss index 0f3978fe0c..7664fc48bc 100644 --- a/src/color-modes/themes/light_high_contrast.scss +++ b/src/color-modes/themes/light_high_contrast.scss @@ -1,6 +1,6 @@ -@import "../../support/index.scss"; +@import '../../support/index.scss'; -@import "@primer/primitives/dist/scss/colors/_light_high_contrast.scss"; +@import '@primer/primitives/dist/scss/colors/_light_high_contrast.scss'; @include color-mode-theme(light_high_contrast) { @include primer-colors-light_high_contrast; diff --git a/src/docs.scss b/src/docs.scss index 21cfdf2abe..fdf7828f07 100644 --- a/src/docs.scss +++ b/src/docs.scss @@ -9,9 +9,9 @@ // Only meant for the docs at https://primer.style/css // CSS color variables -@import "./color-modes/index.scss"; +@import './color-modes/index.scss'; // Global requirements -@import "./core/index.scss"; -@import "./product/index.scss"; -@import "./marketing/index.scss"; +@import './core/index.scss'; +@import './product/index.scss'; +@import './marketing/index.scss'; diff --git a/src/index.scss b/src/index.scss index f2059d2d74..3162442eba 100644 --- a/src/index.scss +++ b/src/index.scss @@ -11,9 +11,9 @@ // Should you need specific files, you can easily use separate `@import`s. // CSS color variables -@import "./color-modes/index.scss"; +@import './color-modes/index.scss'; // Global requirements -@import "./core/index.scss"; -@import "./product/index.scss"; -@import "./marketing/index.scss"; +@import './core/index.scss'; +@import './product/index.scss'; +@import './marketing/index.scss'; diff --git a/src/marketing/buttons/button.scss b/src/marketing/buttons/button.scss index 12f779f0ca..31a35cf248 100644 --- a/src/marketing/buttons/button.scss +++ b/src/marketing/buttons/button.scss @@ -1,25 +1,24 @@ .btn-mktg { - color: var(--color-canvas-default); position: relative; z-index: 1; display: inline-block; - appearance: none !important; // stylelint-disable-next-line primer/spacing padding: 0.9rem 1.5rem 1.1rem; // stylelint-disable-next-line primer/typography font-size: 1rem; font-weight: $font-weight-bold; line-height: 1; + color: var(--color-canvas-default); text-align: center; white-space: nowrap; vertical-align: middle; user-select: none; + background: linear-gradient(180deg, rgba(255 255 255 / 0.15) 0%, rgba(255 255 255 / 0) 100%), var(--color-mktg-btn-bg) !important; border: 0; // stylelint-disable-next-line primer/borders border-radius: 0.375rem; - background: linear-gradient(180deg, rgba(255 255 255 / 0.15) 0%, rgba(255 255 255 / 0) 100%), - var(--color-mktg-btn-bg) !important; transition: box-shadow 0.2s; + appearance: none !important; &::before { position: absolute; @@ -28,11 +27,11 @@ bottom: 0; left: 0; z-index: -1; - content: ""; - // stylelint-disable-next-line primer/borders + content: ''; + // stylelint-disable-next-line primer/colors + background: linear-gradient(180deg, rgba(255 255 255 / 0.15) 0%, rgba(255 255 255 / 0) 100%) !important; border-radius: inherit; opacity: 0; - background: linear-gradient(180deg, rgba(255 255 255 / 0.15) 0%, rgba(255 255 255 / 0) 100%) !important; opacity: 0; transition: opacity 0.2s; background-blend-mode: normal; @@ -44,8 +43,8 @@ &:focus, &.focus { - box-shadow: var(--color-mktg-btn-shadow-focus), var(--color-mktg-btn-shadow-hover) !important; outline: 0; + box-shadow: var(--color-mktg-btn-shadow-focus), var(--color-mktg-btn-shadow-hover) !important; } &:hover, @@ -62,6 +61,7 @@ &:active { outline: none; + // stylelint-disable-next-line primer/box-shadow box-shadow: 0 0 0 transparent; &::before { @@ -89,10 +89,12 @@ } &:active { + // stylelint-disable-next-line primer/box-shadow box-shadow: var(--color-fg-default) 0 0 0 3px inset !important; } &:disabled { + // stylelint-disable-next-line primer/box-shadow box-shadow: var(--color-fg-subtle) 0 0 0 1px inset !important; } } @@ -117,14 +119,18 @@ } .btn-signup-mktg { + // stylelint-disable-next-line primer/colors color: #fff; + // stylelint-disable-next-line primer/colors background: linear-gradient(180deg, rgba(52, 183, 89, 0.15) 0%, rgba(46, 164, 79, 0) 100%), rgb(46, 164, 79) !important; &::before { + // stylelint-disable-next-line primer/colors background: linear-gradient(180deg, rgba(52, 183, 89, 0.15) 0%, rgba(46, 164, 79, 0) 100%) !important; } &:focus { + // stylelint-disable-next-line primer/box-shadow box-shadow: rgba(46, 164, 79, 0.45) 0 0 0 4px !important; } } diff --git a/src/marketing/buttons/index.scss b/src/marketing/buttons/index.scss index 6ff5227f91..de8b941e92 100644 --- a/src/marketing/buttons/index.scss +++ b/src/marketing/buttons/index.scss @@ -1,3 +1,3 @@ // support files -@import "../support/index.scss"; -@import "./button.scss"; +@import '../support/index.scss'; +@import './button.scss'; diff --git a/src/marketing/support/index.scss b/src/marketing/support/index.scss index 8c8e4790ee..a1d235987e 100644 --- a/src/marketing/support/index.scss +++ b/src/marketing/support/index.scss @@ -1,2 +1,2 @@ -@import "../../support/index.scss"; -@import "./variables.scss"; +@import '../../support/index.scss'; +@import './variables.scss'; diff --git a/src/marketing/support/variables.scss b/src/marketing/support/variables.scss index 71c764ee78..c6f3178323 100644 --- a/src/marketing/support/variables.scss +++ b/src/marketing/support/variables.scss @@ -1,6 +1,5 @@ -// stylelint-disable unit-no-unknown // Typography -$marketing-font-path: "/fonts/" !default; +$marketing-font-path: '/fonts/' !default; $font-mktg: $body-font !default; $font-weight-medium: 450 !default; @@ -122,7 +121,7 @@ $transition-time: 0.4s !default; $ease-mktg: cubic-bezier(0.16, 1, 0.3, 1) !default; $marketing-position-variants: ( - "": "", - md: "-md", - lg: "-lg", + '': '', + md: '-md', + lg: '-lg', ) !default; diff --git a/src/marketing/type/index.scss b/src/marketing/type/index.scss index 5ddc98f8f5..cf9891d449 100644 --- a/src/marketing/type/index.scss +++ b/src/marketing/type/index.scss @@ -1,3 +1,3 @@ // support files -@import "../support/index.scss"; -@import "./typography.scss"; +@import '../support/index.scss'; +@import './typography.scss'; diff --git a/src/marketing/type/typography.scss b/src/marketing/type/typography.scss index ba7c6c8676..8520fd2a4f 100644 --- a/src/marketing/type/typography.scss +++ b/src/marketing/type/typography.scss @@ -19,20 +19,20 @@ $pairing-md: map-get($mktg-header-pairings, nth($sizes, 2)); $pairing-lg: map-get($mktg-header-pairings, nth($sizes, 3)); - font-size: map-get($pairing, "size") !important; - line-height: map-get($pairing, "lh") !important; - @if (map-get($pairing, "size") >= $mktg-header-weight-threshold) { font-weight: $mktg-header-weight-large !important; } + font-size: map-get($pairing, 'size') !important; + line-height: map-get($pairing, 'lh') !important; + @if (map-get($pairing, 'size') >= $mktg-header-weight-threshold) { font-weight: $mktg-header-weight-large !important; } @if (nth($sizes, 1) != nth($sizes, 2)) { @include breakpoint(md) { - font-size: map-get($pairing-md, "size") !important; - line-height: map-get($pairing-md, "lh") !important; + font-size: map-get($pairing-md, 'size') !important; + line-height: map-get($pairing-md, 'lh') !important; - @if (map-get($pairing-md, "size") >= $mktg-header-spacing-threshold and map-get($pairing, "size") < $mktg-header-spacing-threshold) { + @if (map-get($pairing-md, 'size') >= $mktg-header-spacing-threshold and map-get($pairing, 'size') < $mktg-header-spacing-threshold) { letter-spacing: $mktg-header-spacing-large !important; } - @if (map-get($pairing-md, "size") >= $mktg-header-weight-threshold and map-get($pairing, "size") < $mktg-header-weight-threshold) { + @if (map-get($pairing-md, 'size') >= $mktg-header-weight-threshold and map-get($pairing, 'size') < $mktg-header-weight-threshold) { font-weight: $mktg-header-weight-large !important; } } @@ -40,14 +40,14 @@ @if (nth($sizes, 2) != nth($sizes, 3)) { @include breakpoint(lg) { - font-size: map-get($pairing-lg, "size") !important; - line-height: map-get($pairing-lg, "lh") !important; + font-size: map-get($pairing-lg, 'size') !important; + line-height: map-get($pairing-lg, 'lh') !important; - @if (map-get($pairing-lg, "size") >= $mktg-header-spacing-threshold and map-get($pairing-md, "size") < $mktg-header-spacing-threshold) { + @if (map-get($pairing-lg, 'size') >= $mktg-header-spacing-threshold and map-get($pairing-md, 'size') < $mktg-header-spacing-threshold) { letter-spacing: $mktg-header-spacing-large !important; } - @if (map-get($pairing-lg, "size") >= $mktg-header-weight-threshold and map-get($pairing-md, "size") < $mktg-header-weight-threshold) { + @if (map-get($pairing-lg, 'size') >= $mktg-header-weight-threshold and map-get($pairing-md, 'size') < $mktg-header-weight-threshold) { font-weight: $mktg-header-weight-large !important; } } @@ -73,21 +73,21 @@ $pairing-md: map-get($mktg-body-pairings, nth($sizes, 2)); $pairing-lg: map-get($mktg-body-pairings, nth($sizes, 3)); - font-size: map-get($pairing, "size") !important; - line-height: map-get($pairing, "lh") !important; - @if (map-get($pairing, "size") >= $mktg-body-spacing-threshold) { letter-spacing: $mktg-body-spacing-large !important; } - @if (map-get($pairing, "size") >= $mktg-body-weight-threshold) { font-weight: $font-weight-semibold; } + font-size: map-get($pairing, 'size') !important; + line-height: map-get($pairing, 'lh') !important; + @if (map-get($pairing, 'size') >= $mktg-body-spacing-threshold) { letter-spacing: $mktg-body-spacing-large !important; } + @if (map-get($pairing, 'size') >= $mktg-body-weight-threshold) { font-weight: $font-weight-semibold; } @if (nth($sizes, 1) != nth($sizes, 2)) { @include breakpoint(md) { - font-size: map-get($pairing-md, "size") !important; - line-height: map-get($pairing-md, "lh") !important; + font-size: map-get($pairing-md, 'size') !important; + line-height: map-get($pairing-md, 'lh') !important; - @if (map-get($pairing-md, "size") >= $mktg-body-spacing-threshold and map-get($pairing, "size") < $mktg-body-spacing-threshold) { + @if (map-get($pairing-md, 'size') >= $mktg-body-spacing-threshold and map-get($pairing, 'size') < $mktg-body-spacing-threshold) { letter-spacing: $mktg-body-spacing-large !important; } - @if (map-get($pairing-md, "size") >= $mktg-body-weight-threshold and map-get($pairing, "size") < $mktg-body-weight-threshold) { + @if (map-get($pairing-md, 'size') >= $mktg-body-weight-threshold and map-get($pairing, 'size') < $mktg-body-weight-threshold) { font-weight: $font-weight-medium; } } @@ -95,14 +95,14 @@ @if (nth($sizes, 2) != nth($sizes, 3)) { @include breakpoint(lg) { - font-size: map-get($pairing-lg, "size") !important; - line-height: map-get($pairing-lg, "lh") !important; + font-size: map-get($pairing-lg, 'size') !important; + line-height: map-get($pairing-lg, 'lh') !important; - @if (map-get($pairing-lg, "size") >= $mktg-body-spacing-threshold and map-get($pairing-md, "size") < $mktg-body-spacing-threshold) { + @if (map-get($pairing-lg, 'size') >= $mktg-body-spacing-threshold and map-get($pairing-md, 'size') < $mktg-body-spacing-threshold) { letter-spacing: $mktg-body-spacing-large !important; } - @if (map-get($pairing-lg, "size") >= $mktg-body-weight-threshold and map-get($pairing-md, "size") < $mktg-body-weight-threshold) { + @if (map-get($pairing-lg, 'size') >= $mktg-body-weight-threshold and map-get($pairing-md, 'size') < $mktg-body-weight-threshold) { font-weight: $font-weight-medium; } } diff --git a/src/marketing/utilities/index.scss b/src/marketing/utilities/index.scss index ae7527ced6..b32b5340b6 100644 --- a/src/marketing/utilities/index.scss +++ b/src/marketing/utilities/index.scss @@ -1,6 +1,6 @@ -@import "../support/index.scss"; +@import '../support/index.scss'; // utilities -@import "./animations.scss"; -@import "./borders.scss"; -@import "./filters.scss"; -@import "./layout.scss"; +@import './animations.scss'; +@import './borders.scss'; +@import './filters.scss'; +@import './layout.scss'; diff --git a/src/marketing/utilities/layout.scss b/src/marketing/utilities/layout.scss index 7575289b45..3445c5494c 100644 --- a/src/marketing/utilities/layout.scss +++ b/src/marketing/utilities/layout.scss @@ -6,7 +6,7 @@ @each $breakpoint, $variant in $marketing-position-variants { @include breakpoint($breakpoint) { @each $scale, $size in $spacer-map-extended { - @if ($size != 0 or $variant != "") { + @if ($size != 0 or $variant != '') { .top#{$variant}-#{$scale} { top: $size !important; } .right#{$variant}-#{$scale} { right: $size !important; } .bottom#{$variant}-#{$scale} { bottom: $size !important; } diff --git a/src/support/mixins/layout.scss b/src/support/mixins/layout.scss index a6d30cf187..a3c51d705f 100644 --- a/src/support/mixins/layout.scss +++ b/src/support/mixins/layout.scss @@ -1,7 +1,7 @@ // Responsive media queries @mixin breakpoint($breakpoint) { - @if $breakpoint == "" { + @if $breakpoint == '' { @content; } @@ -19,8 +19,8 @@ // If the key doesn't exist in the map @else { - @warn "Unfortunately, no value could be retrieved from `#{$breakpoint}`. " - + "Please make sure it is defined in `$breakpoints` map."; + @warn 'Unfortunately, no value could be retrieved from `#{$breakpoint}`. ' + + 'Please make sure it is defined in `$breakpoints` map.'; } } } @@ -47,12 +47,12 @@ @mixin clearfix { &::before { display: table; - content: ""; + content: ''; } &::after { display: table; clear: both; - content: ""; + content: ''; } } diff --git a/src/support/mixins/misc.scss b/src/support/mixins/misc.scss index b75156bbf5..c27ac96a75 100644 --- a/src/support/mixins/misc.scss +++ b/src/support/mixins/misc.scss @@ -10,7 +10,7 @@ width: 8px; height: 16px; pointer-events: none; - content: " "; + content: ' '; clip-path: polygon(0 50%, 100% 0, 100% 100%); } diff --git a/src/support/variables/layout.scss b/src/support/variables/layout.scss index fec2d34f83..cc56fe7f81 100644 --- a/src/support/variables/layout.scss +++ b/src/support/variables/layout.scss @@ -150,11 +150,11 @@ $breakpoints: ( // breakpoints and create both responsive and non-responsive classes in one // loop: $responsive-variants: ( - "": "", - sm: "-sm", - md: "-md", - lg: "-lg", - xl: "-xl", + '': '', + sm: '-sm', + md: '-md', + lg: '-lg', + xl: '-xl', ) !default; // responive utility position values diff --git a/src/support/variables/typography.scss b/src/support/variables/typography.scss index cd22002895..dc46d928c8 100644 --- a/src/support/variables/typography.scss +++ b/src/support/variables/typography.scss @@ -32,7 +32,7 @@ $lh-condensed: 1.25 !default; $lh-default: 1.5 !default; // Font stacks -$body-font: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji" !default; +$body-font: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji' !default; // Monospace font stack // Note: SFMono-Regular needs to come before SF Mono to fix an older version of the font in Chrome