@primer/css 0.0.0-2021102434953 → 0.0.0-20211029165521

package/marketing/buttons/button.scss

@@ -2,137 +2,95 @@
   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;
-  transition: box-shadow 0.2s;
-  appearance: none !important;
+
+  @include btn-solid-mktg(
+    var(--color-mktg-btn-text),
+    var(--color-mktg-btn-bg-top),
+    var(--color-mktg-btn-bg-bottom),
+    var(--color-mktg-btn-bg-overlay-top),
+    var(--color-mktg-btn-bg-overlay-bottom),
+  );
 
   &::before {
+    background-blend-mode: overlay, normal;
     position: absolute;
     top: 0;
     right: 0;
     bottom: 0;
     left: 0;
     z-index: -1;
-    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;
+    content: "";
+    // stylelint-disable-next-line primer/borders
+    border-radius: 0.375rem;
     opacity: 0;
-    opacity: 0;
-    transition: opacity 0.2s;
-    background-blend-mode: normal;
+    transition: opacity 0.4s;
   }
 
   &:hover {
-    box-shadow: var(--color-mktg-btn-shadow-hover) !important;
-  }
+    text-decoration: none;
 
-  &:focus,
-  &.focus {
-    outline: 0;
-    box-shadow: var(--color-mktg-btn-shadow-focus), var(--color-mktg-btn-shadow-hover) !important;
-  }
-
-  &:hover,
-  &:focus,
-  &.focus {
     &::before {
       opacity: 1;
-    }
-
-    &:disabled {
-      box-shadow: none !important;
-    }
-  }
-
-  &:active {
-    outline: none;
-    // stylelint-disable-next-line primer/box-shadow
-    box-shadow: 0 0 0 transparent;
-
-    &::before {
-      opacity: 0.5 !important;
+      transition: opacity 0.4s;
     }
   }
 }
 
-.btn-muted-mktg {
-  color: var(--color-fg-default) !important;
-  background: none !important;
-  box-shadow: var(--color-mktg-btn-shadow-outline);
-
-  &::before {
-    display: none;
-  }
-
-  &:hover {
-    box-shadow: var(--color-mktg-btn-shadow-hover-muted) !important;
-  }
-
-  &:focus,
-  &.focus {
-    box-shadow: var(--color-mktg-btn-shadow-hover-muted), var(--color-mktg-btn-shadow-focus) !important;
-  }
-
-  &: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;
-  }
+.btn-primary-mktg {
+  @include btn-solid-mktg(
+    var(--color-mktg-btn-primary-text),
+    var(--color-mktg-btn-primary-bg-top),
+    var(--color-mktg-btn-primary-bg-bottom),
+    var(--color-mktg-btn-primary-bg-overlay-top),
+    var(--color-mktg-btn-primary-bg-overlay-bottom),
+  );
 }
 
-.btn-subtle-mktg {
-  color: var(--color-fg-default) !important;
-  background: none !important;
-  box-shadow: none !important;
-
-  &::before {
-    background: none !important;
-  }
-
-  &:hover {
-    box-shadow: var(--color-mktg-btn-shadow-hover-muted) !important;
-  }
-
-  &:focus,
-  .focus {
-    box-shadow: var(--color-mktg-btn-shadow-hover-muted), var(--color-mktg-btn-shadow-focus) !important;
-  }
+.btn-enterprise-mktg {
+  @include btn-solid-mktg(
+    var(--color-mktg-btn-enterprise-text),
+    var(--color-mktg-btn-enterprise-bg-top),
+    var(--color-mktg-btn-enterprise-bg-bottom),
+    var(--color-mktg-btn-enterprise-bg-overlay-top),
+    var(--color-mktg-btn-enterprise-bg-overlay-bottom),
+  );
 }
 
-.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;
-  }
+.btn-outline-mktg {
+  @include btn-outline-mktg(
+    var(--color-mktg-btn-outline-text),
+    var(--color-mktg-btn-outline-hover-text),
+    var(--color-mktg-btn-outline-border),
+    var(--color-mktg-btn-outline-hover-border),
+    var(--color-mktg-btn-outline-focus-border),
+    var(--color-mktg-btn-outline-focus-border-inset)
+  );
+  transition: box-shadow 0.4s, color 0.4s;
+}
 
-  &:focus {
-    // stylelint-disable-next-line primer/box-shadow
-    box-shadow: rgba(46, 164, 79, 0.45) 0 0 0 4px !important;
-  }
+.btn-transparent {
+  @include btn-outline-mktg(
+    var(--color-mktg-btn-dark-text),
+    var(--color-mktg-btn-dark-hover-text),
+    var(--color-mktg-btn-dark-border),
+    var(--color-mktg-btn-dark-hover-border),
+    var(--color-mktg-btn-dark-focus-border),
+    var(--color-mktg-btn-dark-focus-border-inset)
+  );
+  transition: box-shadow 0.4s, color 0.4s;
 }
 
 // Size modifiers

package/marketing/buttons/index.scss

@@ -1,3 +1,3 @@
 // support files
-@import '../support/index.scss';
-@import './button.scss';
+@import "../support/index.scss";
+@import "./button.scss";

package/marketing/support/index.scss

@@ -1,2 +1,3 @@
-@import '../../support/index.scss';
-@import './variables.scss';
+@import "../../support/index.scss";
+@import "./mixins.scss";
+@import "./variables.scss";

package/marketing/support/mixins.scss

@@ -0,0 +1,66 @@
+@mixin btn-solid-mktg($color, $bg, $bg2, $bg3, $bg4) {
+  color: $color;
+  background-color: $bg2;
+  background-image: linear-gradient(-180deg, $bg 0%, $bg2 100%);
+
+  &::before {
+    background-image: linear-gradient(-180deg, $bg3 0%, $bg4 100%);
+  }
+
+  &:hover,
+  &.hover,
+  &:active,
+  &.selected,
+  &[aria-selected=true],
+  [open] > & {
+    background-color: $bg2;
+    background-image: linear-gradient(-180deg, $bg 0%, $bg2 100%);
+  }
+
+  &:focus,
+  &.focus {
+    outline: 0;
+    box-shadow: 0 0 0 0.2em rgba($bg2, 0.4);
+  }
+
+  &:disabled,
+  &.disabled,
+  &[aria-disabled=true] {
+    pointer-events: none;
+    cursor: default;
+    opacity: 0.5;
+  }
+}
+
+@mixin btn-outline-mktg($color, $color2, $border, $borderHover, $borderFocus, $borderFocusInset) {
+  color: $color;
+  background: none;
+  box-shadow: 0 0 0 1px $border inset;
+
+  &::before {
+    display: none;
+  }
+
+  &:hover,
+  &.hover,
+  &:active,
+  &.selected,
+  &[aria-selected=true],
+  [open] > & {
+    color: $color2;
+    background: none;
+    box-shadow: 0 0 0 2px $borderHover inset;
+  }
+
+  &:focus,
+  &.focus {
+    outline: 0;
+    box-shadow: 0 0 0 2px $borderFocus inset, 0 0 0 4px $borderFocusInset;
+  }
+
+  &:disabled,
+  &.disabled,
+  &[aria-disabled=true] {
+    opacity: 0.5;
+  }
+}

package/marketing/support/variables.scss

@@ -1,5 +1,6 @@
+// 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;
@@ -121,7 +122,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;

package/marketing/type/index.scss

@@ -1,3 +1,3 @@
 // support files
-@import '../support/index.scss';
-@import './typography.scss';
+@import "../support/index.scss";
+@import "./typography.scss";

package/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;
         }
       }

package/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";

package/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; }

package/navigation/underline-nav.scss

@@ -1,8 +1,7 @@
-$nav-height: $spacer-3 * 3 !default; // 48px
-
 .UnderlineNav {
   display: flex;
-  min-height: $nav-height;
+  overflow-x: auto;
+  overflow-y: hidden;
   // stylelint-disable-next-line primer/box-shadow
   box-shadow: inset 0 -1px 0 var(--color-border-muted);
   justify-content: space-between;
@@ -10,13 +9,10 @@ $nav-height: $spacer-3 * 3 !default; // 48px
 
 .UnderlineNav-body {
   display: flex;
-  align-items: center;
-  gap: $spacer-2;
 }
 
 .UnderlineNav-item {
-  position: relative;
-  padding: 0 $spacer-2;
+  padding: $spacer-2 $spacer-3;
   font-size: $body-font-size;
   // stylelint-disable-next-line primer/typography
   line-height: 30px;
@@ -25,62 +21,32 @@ $nav-height: $spacer-3 * 3 !default; // 48px
   white-space: nowrap;
   background-color: transparent;
   border: 0;
-  border-radius: $border-radius;
-
-  // increase touch target area
-  &::before {
-    @include minTouchTarget($min-height: $nav-height);
-  }
+  // stylelint-disable-next-line primer/borders
+  border-bottom: 2px $border-style transparent;
 
-  &:hover {
+  &:hover,
+  &:focus {
     color: var(--color-fg-default);
     text-decoration: none;
-    background: var(--color-neutral-muted);
-    transition: background 0.12s ease-out;
+    border-bottom-color: var(--color-neutral-muted);
+    outline: 1px dotted transparent; // Support Firefox custom colors
+    outline-offset: -1px;
+    transition: border-bottom-color 0.12s ease-out;
   }
 
   &.selected,
-  &[role='tab'][aria-selected='true'],
-  &[aria-current]:not([aria-current='false']) {
+  &[role=tab][aria-selected=true],
+  &[aria-current]:not([aria-current=false]) {
     font-weight: $font-weight-bold;
     color: var(--color-fg-default);
-
-    // current/selected underline
-    &::after {
-      position: absolute;
-      right: 50%;
-      // 48px total height / 2 (24px) + 1px
-      bottom: calc(50% - 25px);
-      width: 100%;
-      height: 2px;
-      content: '';
-      background: var(--color-primer-border-active);
-      border-radius: $border-radius;
-      transform: translate(50%, -50%);
-    }
+    border-bottom-color: var(--color-primer-border-active);
+    outline: 1px dotted transparent; // Support Firefox custom colors
+    outline-offset: -1px;
 
     .UnderlineNav-octicon {
       color: var(--color-fg-muted);
     }
   }
-
-  // remove when global focus state is merged
-  &.focus,
-  &:focus {
-    @include focusOutline;
-    outline-offset: 0;
-  }
-
-  .Counter {
-    margin-left: $spacer-2;
-    color: var(--color-fg-default);
-    background-color: var(--color-neutral-muted);
-
-    &--primary {
-      color: var(--color-fg-on-emphasis);
-      background-color: var(--color-neutral-emphasis);
-    }
-  }
 }
 
 .UnderlineNav--right {
@@ -97,18 +63,24 @@ $nav-height: $spacer-3 * 3 !default; // 48px
 
 .UnderlineNav--full {
   display: block;
-
-  // required for underline to align with additional wrapper element
-  .UnderlineNav-body {
-    min-height: $nav-height;
-  }
 }
 
 .UnderlineNav-octicon {
-  margin-right: $spacer-2;
+  margin-right: $spacer-1;
   color: var(--color-fg-subtle);
 }
 
+.UnderlineNav .Counter {
+  margin-left: $spacer-1;
+  color: var(--color-fg-default);
+  background-color: var(--color-neutral-muted);
+
+  &--primary {
+    color: var(--color-fg-on-emphasis);
+    background-color: var(--color-neutral-emphasis);
+  }
+}
+
 .UnderlineNav-container {
   display: flex;
   justify-content: space-between;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/css",
-  "version": "0.0.0-2021102434953",
+  "version": "0.0.0-20211029165521",
   "description": "The CSS implementation of GitHub's Primer Design System",
   "homepage": "https://primer.style/css",
   "author": "GitHub, Inc.",
@@ -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",
@@ -35,19 +35,19 @@
     "storybook": "cd docs && yarn && yarn storybook"
   },
   "dependencies": {
-    "@primer/primitives": "^7.1.0"
+    "@primer/primitives": "^6.1.0"
   },
   "devDependencies": {
     "@changesets/changelog-github": "0.4.1",
-    "@changesets/cli": "2.18.0",
+    "@changesets/cli": "2.17.0",
     "@github/prettier-config": "0.0.4",
     "@koddsson/postcss-sass": "5.0.0",
-    "@primer/stylelint-config": "12.1.1",
+    "@primer/stylelint-config": "12.1.0",
     "autoprefixer": "10.4.0",
     "cssstats": "4.0.2",
-    "eslint": "8.3.0",
-    "eslint-plugin-github": "4.3.5",
-    "eslint-plugin-jest": "25.2.4",
+    "eslint": "8.1.0",
+    "eslint-plugin-github": "4.3.3",
+    "eslint-plugin-jest": "25.2.2",
     "eslint-plugin-prettier": "4.0.0",
     "filesize": "8.0.6",
     "front-matter": "4.0.2",
@@ -63,9 +63,9 @@
     "postcss-simple-vars": "6.0.3",
     "prettier": "2.4.1",
     "semver": "7.3.5",
-    "stylelint": "14.1.0",
+    "stylelint": "14.0.1",
     "stylelint-scss": "4.0.0",
-    "table": "6.7.3"
+    "table": "6.7.2"
   },
   "jest": {
     "testEnvironment": "node",

package/popover/popover.scss

@@ -8,9 +8,6 @@
   width: 232px;
   margin-right: auto;
   margin-left: auto;
-  background-color: var(--color-canvas-overlay);
-  border: $border-width $border-style var(--color-border-default);
-  border-radius: $border-radius;
 
   // Carets
   &::before,
@@ -37,13 +34,10 @@
     border: 7px $border-style transparent;
     border-bottom-color: var(--color-canvas-overlay);
   }
-}
 
-// No caret
-.Popover-message--no-caret {
-  &::before,
-  &::after {
-    display: none;
+  // TODO: Refactor so that .Popover is not dependant on .Box
+  &.Box {
+    background-color: var(--color-canvas-overlay);
   }
 }
 
@@ -188,40 +182,8 @@
 }
 
 .Popover-message--large {
+
   @include breakpoint(sm) {
     min-width: 320px;
   }
 }
-
-// Responsive Popover
-// For < md it will show full-width anchored to the bottom
-
-@media (max-width: ($width-md - 1px)) {
-  .Popover {
-    position: fixed;
-    top: auto;
-    right: 0;
-    bottom: 0;
-    left: 0;
-  }
-
-  .Popover-message {
-    top: auto;
-    right: auto;
-    bottom: auto;
-    left: auto;
-    width: auto;
-    margin: $spacer-2;
-  }
-
-  // Increase tap area for touch input
-  .Popover-message > .btn-octicon {
-    padding: $spacer-2 + $spacer-1 !important;
-  }
-
-  // Remove caret
-  .Popover-message::after,
-  .Popover-message::before {
-    display: none;
-  }
-}