Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 12.0.1 #683

Merged
merged 15 commits into from
Feb 21, 2019
Merged

Release 12.0.1 #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
74cf4cd
add missing h000-mktg
gladwearefriends Jan 29, 2019
25f776b
npm: break out lint-css, lint-js scripts
shawnbot Feb 20, 2019
5b59cc2
npm: nix postlint script, add postversion
shawnbot Feb 20, 2019
05f0a49
docs(releasing): tweak release PR template
shawnbot Feb 20, 2019
b0732db
chore: v12.0.1
shawnbot Feb 20, 2019
b1b020f
Merge branch 'master' into fix-h000
shawnbot Feb 20, 2019
59614f9
Merge pull request #667 from primer/fix-h000
shawnbot Feb 20, 2019
aa2765f
fix(underline-nav): add overflow-x and overflow-y
shawnbot Feb 20, 2019
43fd5ce
fix(UnderlineNav): remove -1px margin-bottom from .UnderlineNav-body
shawnbot Feb 20, 2019
14ee520
chore: lint
shawnbot Feb 20, 2019
ce5b76b
Revert "fix(UnderlineNav): remove -1px margin-bottom from .UnderlineN…
shawnbot Feb 20, 2019
1f85792
Merge pull request #684 from primer/underline-nav-overflow
shawnbot Feb 20, 2019
351d627
fix(Box): resolves #685
shawnbot Feb 20, 2019
16dc8e0
Merge pull request #686 from primer/fix-box-header
shawnbot Feb 20, 2019
d0c13af
chore: update CHANGELOG.md
shawnbot Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# 12.0.1

### :bug: Bug Fix
- Add missing `h000-mktg` class [#667](https://github.com/primer/css/pull/667)
- Fix UnderlineNav overflow issues [#684](https://github.com/primer/css/pull/684)
- Fix double borders on Box-header [#686](https://github.com/primer/css/pull/686)

### :house: Internal
- Add `postversion` npm script that commits `package.json` and `package-lock.json` with consistent commit messages (`chore: v<version>`)

# 12.0.0

: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.
Expand Down
2 changes: 1 addition & 1 deletion RELEASING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
### Ship checklist

- [ ] Update `CHANGELOG.md`
- [ ] Increment version in `package.json` with `npm version`
- [ ] Update the version in `package.json` with `npm version <version>`
- [ ] [Create a new release](https://github.com/primer/css/releases/new)
- [ ] [Update github/github](https://github.com/primer/css/blob/master/RELEASING.md#in-githubgithub)
- [ ] Create a new pull request for the next release
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/css",
"version": "12.0.0",
"version": "12.0.1",
"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": "http://primer.github.io/",
"author": "GitHub, Inc.",
Expand All @@ -25,11 +25,12 @@
"dist": "script/dist",
"build-storybook": "build-storybook -o build",
"check-links": "script/check-links http://localhost:3000/css -v",
"lint": "stylelint --quiet --syntax scss src/**/*.scss",
"lint": "npm-run-all -s lint-css lint-js",
"lint-css": "stylelint --quiet --syntax scss src/**/*.scss",
"lint-js": "eslint lib docs",
"now-build": "next build",
"now-start": "next start",
"postlint": "npm run lint-js",
"postversion": "git commit -m \"chore: v$npm_package_version\" package*.json",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the benefit of doing this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a little over-engineered to me. I think most contributors know how to manually change the version, and I think it makes the PR instructions actually more confusing

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I explained in Slack, but for posterity:

This makes it possible for npm version 12.0.1 or npm version patch to do everything necessary, which matches up with what we instruct people to do (npm version) in the release PR template.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still think it's not totally necessary tbh. Most people already know how to upgrade a version manually and I'd rather stick to simple processes across all of our repos that are consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough! I'll remove it in the next release.

"postpublish": "script/postpublish",
"prepare": "npm run dist",
"prepublishOnly": "script/prepublish",
Expand Down
2 changes: 1 addition & 1 deletion src/box/box.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

.Box-header {
padding: $spacer-3;
margin: -$border-width -$border-width 0;
margin: (-$border-width) (-$border-width) 0;
background-color: $bg-gray;
border-color: $border-gray-dark;
border-style: $border-style;
Expand Down
1 change: 1 addition & 0 deletions src/marketing/type/typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Headings

.h000-mktg,
.h00-mktg,
.h0-mktg,
.h1-mktg,
Expand Down
4 changes: 3 additions & 1 deletion src/navigation/underline-nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
.UnderlineNav {
display: flex;
justify-content: space-between;
overflow-x: auto;
overflow-y: hidden;
border-bottom: 1px solid $gray-200;
justify-content: space-between;
}

.UnderlineNav-body {
Expand Down