Skip to content

Commit

Permalink
Merge branch 'main' into layout-component-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
jonrohan authored May 20, 2021
2 parents 91f7cb9 + 81f4397 commit 9bff0b8
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 21 deletions.
5 changes: 0 additions & 5 deletions .changeset/twenty-apples-attack.md

This file was deleted.

14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# @primer/css

## 17.0.3

### Patch Changes

- [#1410](https://github.com/primer/css/pull/1410) [`d5e425e4`](https://github.com/primer/css/commit/d5e425e40900102b5b728a516de71e4094b7e138) Thanks [@simurai](https://github.com/simurai)! - Bump @primer/primitives@4.3.4

## 17.0.2

### Patch Changes

- [#1408](https://github.com/primer/css/pull/1408) [`1eea5575`](https://github.com/primer/css/commit/1eea557506241412de068c0f2570a0e9606fd6c2) Thanks [@colebemis](https://github.com/colebemis)! - Bump @primer/primitives version

* [#1403](https://github.com/primer/css/pull/1403) [`5ef399cf`](https://github.com/primer/css/commit/5ef399cff004fc30d0b98750af889ffdc4bf8f3b) Thanks [@tobiasahlin](https://github.com/tobiasahlin)! - Remove !important for base styles for body utilities

## 17.0.1

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/css",
"version": "17.0.1",
"version": "17.0.3",
"description": "The CSS implementation of GitHub's Primer Design System",
"homepage": "https://primer.style/css",
"author": "GitHub, Inc.",
Expand Down Expand Up @@ -30,7 +30,7 @@
"release": "changeset publish"
},
"dependencies": {
"@primer/primitives": "4.3.2"
"@primer/primitives": "4.3.4"
},
"devDependencies": {
"@changesets/changelog-github": "0.4.0",
Expand All @@ -48,7 +48,7 @@
"globby": "11.0.3",
"jest": "26.6.3",
"js-yaml": "4.1.0",
"postcss": "8.2.14",
"postcss": "8.2.15",
"postcss-import": "14.0.2",
"postcss-load-config": "3.0.1",
"postcss-node-sass": "3.1.0",
Expand Down
5 changes: 5 additions & 0 deletions src/base/modes-v2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@import '@primer/primitives/dist/scss/colors_v2/_light.scss';
@import '@primer/primitives/dist/scss/colors_v2/_dark.scss';
@import '@primer/primitives/dist/scss/colors_v2/_dark_dimmed.scss';
@import '@primer/primitives/dist/scss/colors_v2/_dark_high_contrast.scss';

// Outputs the CSS variables
// Use :root (html element) to define a default
Expand All @@ -20,3 +21,7 @@
@include color-mode-theme(dark_dimmed) {
@include primer-colors_v2-dark_dimmed;
}

@include color-mode-theme(dark_high_contrast) {
@include primer-colors_v2-dark_high_contrast;
}
26 changes: 13 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -760,10 +760,10 @@
"@nodelib/fs.scandir" "2.1.4"
fastq "^1.6.0"

"@primer/[email protected].2":
version "4.3.2"
resolved "https://registry.yarnpkg.com/@primer/primitives/-/primitives-4.3.2.tgz#687883aa6955de33d1e8ca15154509179222f72b"
integrity sha512-5qBEQVchd2Vd2K2IT9mbQdI9E4IGiDVoLITlQXE2HIW9sWHREULSE4xg3W51i/XlDUIgnycELCI+Ept8V7v+og==
"@primer/[email protected].4":
version "4.3.4"
resolved "https://registry.yarnpkg.com/@primer/primitives/-/primitives-4.3.4.tgz#5b3d8b8edb9b3c11218e9d4da906705d52b9892c"
integrity sha512-2pA7P7rqX6Iz9yp/Z2LiPsRz35OmUR3SNryHiLXazGaJRbS+qlaU9/PPcw74d46/VG/dKcZQJOzsbPKcRq183g==

"@sinonjs/commons@^1.7.0":
version "1.8.2"
Expand Down Expand Up @@ -4760,10 +4760,10 @@ nan@^2.13.2:
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==

nanoid@^3.1.22:
version "3.1.22"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844"
integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==
nanoid@^3.1.23:
version "3.1.23"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==

nanomatch@^1.2.9:
version "1.2.13"
Expand Down Expand Up @@ -5458,13 +5458,13 @@ postcss-values-parser@^4.0.0:
is-url-superb "^4.0.0"
postcss "^7.0.5"

[email protected].14, postcss@^8.1.0, postcss@^8.1.4, postcss@^8.2.4, postcss@^8.2.7:
version "8.2.14"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.14.tgz#dcf313eb8247b3ce8078d048c0e8262ca565ad2b"
integrity sha512-+jD0ZijcvyCqPQo/m/CW0UcARpdFylq04of+Q7RKX6f/Tu+dvpUI/9Sp81+i6/vJThnOBX09Quw0ZLOVwpzX3w==
[email protected].15, postcss@^8.1.0, postcss@^8.1.4, postcss@^8.2.4, postcss@^8.2.7:
version "8.2.15"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==
dependencies:
colorette "^1.2.2"
nanoid "^3.1.22"
nanoid "^3.1.23"
source-map "^0.6.1"

postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.5, postcss@^7.0.6:
Expand Down

0 comments on commit 9bff0b8

Please sign in to comment.