primer/css
1
1
Fork 0
mirror of https://github.com/primer/css.git synced 2024-12-01 04:21:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release-10.9.0' into patch-1

Browse Source
This commit is contained in:
Shawn Allen 2018-10-17 13:19:39 -07:00 committed by GitHub
commit 909384f39b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2657 additions and 8543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,6 +1,6 @@
language: node_js
node_js:
- 7
- 8
env:
global:

2
CHANGELOG.md
View File

@ -1,3 +1,5 @@
# 10.9.0
# 10.8.1
#### :bug: Bug Fix
* [#554](https://github.com/primer/primer/pull/554) Fixes peer dependency issues ([@emplums](https://github.com/emplums))

2
modules/primer-base/lib/normalize.scss vendored
View File

@ -82,7 +82,7 @@ progress {
template, /* 1 */
[hidden] {
display: none;
display: none !important;
}
/* Links

2
modules/primer-support/lib/variables/layout.scss
View File

@ -60,7 +60,7 @@ $breakpoints: (
sm: $width-sm,
// Medium screen / tablet
md: $width-md,
// Large screen / desktop (980 + (12 * 2)) <= container + gutters
// Large screen / desktop (980 + (16 * 2)) <= container + gutters
lg: $width-lg,
// Extra large screen / wide desktop
xl: $width-xl

11180
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@ -20,9 +20,9 @@
"test": "npm run test-all-modules && lerna run test",
"test-all-modules": "ava --verbose tests/test-*.js"
},
"devDependencies": {
"dependencies": {
"primer-module-build": "file:tools/primer-module-build",
"stylelint-config-primer": "^2.2.6",
"stylelint-config-primer": "file:tools/stylelint-config-primer",
"@storybook/addon-options": "3.4.3",
"@storybook/addons": "3.4.3",
"@storybook/react": "3.4.3",
@ -40,7 +40,7 @@
"globby": "^6.1.0",
"html-to-react": "^1.2.11",
"isomorphic-fetch": "^2.2.1",
"lerna": "2.4.0",
"lerna": "2.11.0",
"lerna-changelog": "^0.7.0",
"minimatch": "^3.0.4",
"node-sass": "^4.9.0",

6
script/publish-storybook
View File

@ -10,7 +10,11 @@ if (!process.env.GH_TOKEN) {
ghpages.publish('build',{
branch: 'gh-pages',
repo: `https://primer-css:${process.env.GH_TOKEN}@github.com/primer/storybook.git`
repo: `https://primer-css:${process.env.GH_TOKEN}@github.com/primer/storybook.git`,
user: {
name: 'Primer CSS',
email: 'design-systems@github.com'
}
}, (error) => {
if(error) {
console.error('gh-pages failed to publish:', error.message.replace(process.env.GH_TOKEN, ''))