Skip to content

Commit

Permalink
Merge branch 'main' into jest_tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jonrohan authored Mar 31, 2021
2 parents 1007be5 + f957511 commit fea05b9
Show file tree
Hide file tree
Showing 17 changed files with 16 additions and 50 deletions.
5 changes: 0 additions & 5 deletions .changeset/hip-bulldogs-judge.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/bundle_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Bundle report
on:
push:
paths:
- 'src'
- 'src/**'
jobs:
bundle:
runs-on: ubuntu-latest
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release_canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ on:
- 'lib/**'
- '__tests__/**'
- 'script/**'
- 'static/**'
- 'next.config.js'
- 'now.json'

Expand Down
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ pages/
script/
# we ignore this because everything in src/ is copied out in script/prepublish
src/
static/
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @primer/css

## 16.1.2

### Patch Changes

- [#1282](https://github.com/primer/css/pull/1282) [`5ee52dfe`](https://github.com/primer/css/commit/5ee52dfe59f1b209ca6c1f2489db0e32660388e9) Thanks [@simurai](https://github.com/simurai)! - Add bg to UnderlineNav Counter

* [#1286](https://github.com/primer/css/pull/1286) [`9044eecf`](https://github.com/primer/css/commit/9044eecf4ef7a1c6ad9ccf0b51def53c52d0def4) Thanks [@jonrohan](https://github.com/jonrohan)! - color-mode mixin fix for keyboard toggle

## 16.1.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center">
<img width="300px" src="./static/readme.png">
<img width="300px" src="./docs/src/readme.png">
</p>

<h1 align="center">Primer CSS</h1>
Expand Down
7 changes: 0 additions & 7 deletions docs/gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@ module.exports = {
svgo: false
}
},
{
resolve: 'gatsby-plugin-google-analytics',
options: {
trackingId: 'UA-126681523-2',
anonymize: true
}
},
{
resolve: `gatsby-plugin-alias-imports`,
options: {
Expand Down
1 change: 0 additions & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"core-js": "^3.6.5",
"gatsby": "^2.24.62",
"gatsby-plugin-alias-imports": "^1.0.5",
"gatsby-plugin-google-analytics": "^2.3.14",
"gatsby-plugin-sass": "^2.3.13",
"gatsby-plugin-svgr": "^2.0.2",
"postcss-loader": "^3.0.0",
Expand Down
File renamed without changes
8 changes: 0 additions & 8 deletions docs/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6935,14 +6935,6 @@ gatsby-plugin-catch-links@^2.1.2:
"@babel/runtime" "^7.12.5"
escape-string-regexp "^1.0.5"

gatsby-plugin-google-analytics@^2.3.14:
version "2.11.0"
resolved "https://registry.yarnpkg.com/gatsby-plugin-google-analytics/-/gatsby-plugin-google-analytics-2.11.0.tgz#8d74bd3c100706f03bbccf7b130a758fce9994ad"
integrity sha512-aVFmzoozd0ifn5HJJY0W8R7DHkyTEvj/ueRyJJNlQMadQagIAYq+7efKon4gJzd4NZkLcoDb6moiAR066FwIIg==
dependencies:
"@babel/runtime" "^7.12.5"
minimatch "3.0.4"

gatsby-plugin-manifest@^2.2.1:
version "2.12.1"
resolved "https://registry.yarnpkg.com/gatsby-plugin-manifest/-/gatsby-plugin-manifest-2.12.1.tgz#d92f23d2d17d3c69445ef7b7842e5441e8dd785e"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/css",
"version": "16.1.1",
"version": "16.1.2",
"description": "Primer is the CSS framework that powers GitHub's front-end design. primer includes 23 packages that are grouped into 3 core meta-packages for easy install. Each package and meta-package is independently versioned and distributed via npm, so it's easy to include all or part of Primer within your own project.",
"homepage": "https://primer.style/css",
"author": "GitHub, Inc.",
Expand Down
12 changes: 0 additions & 12 deletions script/update-assets

This file was deleted.

8 changes: 5 additions & 3 deletions src/support/mixins/color-modes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@
@mixin color-mode($mode) {
@if $mode == light {
:root,
[data-color-mode="#{$mode}"][data-#{$mode}-theme*="#{$mode}"] {
[data-color-mode="light"][data-light-theme*="#{$mode}"],
[data-color-mode="dark"][data-dark-theme*="#{$mode}"] {
@content;
}
}
@else {
[data-color-mode="#{$mode}"][data-#{$mode}-theme*="#{$mode}"] {
[data-color-mode="light"][data-light-theme*="#{$mode}"],
[data-color-mode="dark"][data-dark-theme*="#{$mode}"] {
@content;
}
}
Expand All @@ -53,7 +55,7 @@
}

// This mixin takes a map of color mode vars and splits them into dark and light mode
// The goal is to reduce the amount of dark/light mode selectors compiled
// The goal is to reduce the amount of dark/light mode selectors compiled.
//
// Example input for $color-map
//
Expand Down
Empty file removed static/.gitkeep
Empty file.
4 changes: 0 additions & 4 deletions static/analytics.js

This file was deleted.

2 changes: 0 additions & 2 deletions static/github/styleguide.css

This file was deleted.

3 changes: 0 additions & 3 deletions static/github/styleguide.js

This file was deleted.

0 comments on commit fea05b9

Please sign in to comment.