Skip to content

Commit

Permalink
Merge pull request #683 from primer/release-12.0.1
Browse files Browse the repository at this point in the history
Release 12.0.1
  • Loading branch information
shawnbot committed Feb 21, 2019
2 parents 6fed17f + d0c13af commit 05b66d8
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 7 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
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
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

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
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",
"postpublish": "script/postpublish",
"prepare": "npm run dist",
"prepublishOnly": "script/prepublish",
Expand Down
2 changes: 1 addition & 1 deletion src/box/box.scss
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
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
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

0 comments on commit 05b66d8

Please sign in to comment.