Skip to content

Commit 3dd48ca

Browse files
committed
Merge remote-tracking branch 'origin/master' into tooltip
2 parents df00424 + 05b66d8 commit 3dd48ca

File tree

481 files changed

+21844
-31793
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

481 files changed

+21844
-31793
lines changed

.browserslistrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
> 5%
2+
last 2 firefox versions
3+
last 2 chrome versions
4+
last 2 safari versions
5+
last 2 edge versions
6+
ie 11

.eslintrc.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"extends": [
3+
"plugin:github/es6",
4+
"plugin:github/recommended"
5+
],
6+
"env": {
7+
"es6": true,
8+
"node": true
9+
},
10+
"parserOptions": {
11+
"ecmaVersion": 2017
12+
}
13+
}

.github/main.workflow

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
workflow "lint, test, deploy, publish" {
2+
on = "push"
3+
resolves = [
4+
"lint",
5+
"test",
6+
"publish",
7+
"deploy",
8+
]
9+
}
10+
11+
action "install" {
12+
uses = "actions/npm@v2.0.0"
13+
args = ["install", "--unsafe-perm"]
14+
}
15+
16+
action "lint" {
17+
needs = "install"
18+
uses = "actions/npm@v2.0.0"
19+
args = ["--unsafe-perm", "run", "lint"]
20+
}
21+
22+
action "test" {
23+
needs = "install"
24+
uses = "actions/npm@v2.0.0"
25+
args = ["--unsafe-perm", "test"]
26+
}
27+
28+
action "publish" {
29+
needs = ["lint", "test"]
30+
uses = "primer/publish@v1.0.0"
31+
args = ["--", "--unsafe-perm"]
32+
secrets = ["GITHUB_TOKEN", "NPM_AUTH_TOKEN"]
33+
}
34+
35+
action "deploy" {
36+
needs = "install"
37+
uses = "primer/deploy@v2.2.0"
38+
secrets = [
39+
"GITHUB_TOKEN",
40+
"NOW_TOKEN",
41+
]
42+
}

.github/pull_request_template.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
- [ ] First, briefly describe your proposal in the title.
1+
First, briefly describe your proposal in the title and delete this line.
22

3-
- [ ] Fixes: # (type an issue number after the # if applicable)
3+
If your proposal fixes any issues, please list them below, then delete this line:
4+
5+
- Fixes: # (type an issue number after the # if applicable)
46

57
Finally, tell us more about the change here, in the description.
68

.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
*.lerna_backup
21
*.log
3-
*/*/package-lock.json
2+
*.tgz
43
.DS_Store
54
.changelog
5+
.next/
66
.sass-cache
77
_site
8-
build
9-
primer-version.txt
10-
node_modules
8+
build/
9+
dist/
10+
node_modules/

.npmignore

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,15 @@
1-
*.yml
2-
.postcss.json
1+
*.log
2+
.github/
3+
.next/
4+
.storybook/
5+
next.config.js
6+
now.json
7+
docs/
8+
docs-test/
9+
lib/
10+
pages/
11+
script/
12+
# we ignore this because everything in src/ is copied out in script/prepublish
13+
src/
14+
static/
15+
tests/

.npmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
save=true
22
save-exact=true
3-
no-package-lock=true
3+
git-tag-version=false

.nvmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# 12.0.1
2+
3+
### :bug: Bug Fix
4+
- Add missing `h000-mktg` class [#667](https://github.com/primer/css/pull/667)
5+
- Fix UnderlineNav overflow issues [#684](https://github.com/primer/css/pull/684)
6+
- Fix double borders on Box-header [#686](https://github.com/primer/css/pull/686)
7+
8+
### :house: Internal
9+
- Add `postversion` npm script that commits `package.json` and `package-lock.json` with consistent commit messages (`chore: v<version>`)
10+
11+
# 12.0.0
12+
13+
:rotating_light: **Starting with version 12.0.0, the `primer` package is now known as `@primer/css`**. See [MIGRATING.md](https://github.com/primer/css/tree/master/MIGRATING.md) for more info.
14+
15+
#### :boom: Breaking Change
16+
* [#666](https://github.com/primer/css/pull/666) Reorganize into a single `@primer/css` package ([@shawnbot](https://github.com/shawnbot))
17+
118
# 11.0.0
219

320
#### :boom: Breaking Change

0 commit comments

Comments
 (0)