1
1
mirror of https://github.com/primer/css.git synced 2025-01-02 11:12:27 +03:00

Merge pull request #294 from primer/master

Merge v9.2.0 changes to dev
This commit is contained in:
Shawn Allen 2017-08-09 12:09:11 -07:00 committed by GitHub
commit 1eb372a016
34 changed files with 151 additions and 159 deletions

View File

@ -49,7 +49,7 @@ Example:
## Feature requests
Feature requests are welcome. But take a moment to find out whether your idea fits with the scope and aims of the project. It's up to *you* to make a strong case to convince the project's developers of the merits of this feature. Please provide as much detail and context as possible.
Feature requests are welcome, but take a moment to find out whether your idea fits with the scope and aims of the project. It's up to *you* to make a strong case to convince the project's developers of the merits of this feature. Please provide as much detail and context as possible.
## Pull requests
@ -57,18 +57,25 @@ Good pull requests—patches, improvements, new features—are a fantastic help.
**Please ask first** before embarking on any significant pull request (e.g. implementing features, refactoring code, porting to a different language), otherwise you risk spending a lot of time working on something that the project's developers might not want to merge into the project.
Adhering to the following process is the best way to get your work included in the project:
### Updating Primer modules
1. Fork and clone the repository
2. Configure and install the dependencies: `bower install`
3. Create a new branch: `git checkout -b my-branch-name`
4. Make your change, add tests, and make sure the tests still pass
5. Push to your fork and [submit a pull request][pr]
6. Pat your self on the back and wait for your pull request to be reviewed and merged.
Anyone can open a pull request on Primer CSS. You do not need to work at GitHub or be a member of the org to open a pull request.
1. Fork and clone [this repository](https://github.com/primer/primer-css).
2. Configure and install the dependencies: `npm install`
3. Check out the dev branch `git checkout dev`
3. Create a new branch from dev `git checkout -b my-branch-name`
4. Make your changes and commit them.
5. Push your branch and open a pull request against `dev`. Add a comment describing your proposed changes and request a review from `@primer/ds-core`.
6. Wait for CI tests to finish.
- If the tests pass, you should see a status check telling you which alpha version of primer-css you can install with npm to test your work in other projects.
- If the tests fail, review the logs and address any issues.
- If the builds fail for any other reason (as they occasionally do), they may need to be manually restarted.
7. When CI tests pass, a new npm alpha release will be posted under the CI checks, you can use this npm version for testing in your project or with a GitHub site if you are staff.
8. Pat yourself on the back and wait for your pull request to be reviewed.
Here are a few things you can do that will increase the likelihood of your pull request being accepted:
- Follow the [style guide][style].
- Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests.
- Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).

View File

@ -18,18 +18,22 @@ script:
after_success:
# this will short-circuit the publish step if it fails to interpolate $NPM_API_KEY
- npm config set "//registry.npmjs.org/:_authToken=\${NPM_API_KEY}"
# copy the CHANGELOG.md primer-css for publishing
- cp CHANGELOG.md modules/primer-css
- script/after_success
deploy:
# publish release candidates on release branches
- provider: script
script: script/release-candidate
skip_cleanup: true
on:
branch: /^release/
branch: release*
# publish "final" releases on master
- provider: script
script: script/release
skip_cleanup: true
on:
branch: master

View File

@ -1,6 +1,19 @@
# HEAD
# 9.2.0
## New
- Add `test-docs` npm script in each module to check that every CSS class is documented (or at least mentioned) in the module's own markdown docs
## Changes
- Remove per-module configurations (`.gitignore`, `.postcss.json`, `.stylelintrc.json`) and `CHANGELOG.md` files in #284
- Replace most static `font-size`, `font-weight`, and `line-height` CSS property values with their [SCSS variable equivalents](https://github.com/primer/primer-css/blob/c9ea37316fbb73c4d9931c52b42bc197260c0bf6/modules/primer-support/lib/variables/typography.scss#L12-L33) in #252
- Refactor CI scripts to use Travis conditional deployment for release candidate and final release publish steps in #290
# 9.1.1
This release updates primer modules to use variables for spacing units instead of pixel values.
## Changes

View File

@ -1,5 +1,5 @@
{
"version": "1.2.1",
"version": "1.3.0",
"name": "primer-alerts",
"description": "Flash messages, or alerts, inform users of successful or pending actions.",
"homepage": "http://primercss.io/",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"alerts",
"callouts",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-avatars",
"description": "Basic styles for user profile avatars.",
"homepage": "http://primercss.io/",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"avatars",
"primer",

View File

@ -1,5 +1,5 @@
{
"version": "1.2.1",
"version": "1.3.0",
"name": "primer-base",
"description": "CSS to reset the browsers default styles",
"homepage": "http://primercss.io/",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-blankslate",
"description": "Blankslates are for when there is a lack of content within a page or section.",
"homepage": "http://primercss.io/",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "2.2.1",
"version": "2.3.0",
"name": "primer-box",
"description": "A module for creating rounded-corner boxes with options for headers, lists, and footers.",
"homepage": "http://primercss.io/",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-breadcrumb",
"description": "Breadcrumb navigation for pages with parents / grandparents.",
"homepage": "http://primercss.io/",
@ -24,10 +24,9 @@
"test": "npm-run-all -s build lint test-docs"
},
"dependencies": {
"primer-marketing-support": "^1.1.0",
"primer-support": "^4.1.1"
"primer-marketing-support": "^1.2.0",
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"breadcrumb",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "2.1.1",
"version": "2.2.0",
"name": "primer-buttons",
"description": "A collection of buttons used for primary and secondary actions.",
"homepage": "http://primercss.io/",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "0.2.1",
"version": "0.3.0",
"name": "primer-cards",
"description": "Card-like containers to group semantically related content together on marketing websites at GitHub.",
"homepage": "http://primercss.io/",
@ -23,10 +23,9 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-marketing-support": "^1.1.0",
"primer-support": "^4.1.1"
"primer-marketing-support": "^1.2.0",
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"cards",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "6.1.1",
"version": "6.2.0",
"name": "primer-core",
"description": "Primer CSS's core modules",
"homepage": "http://primercss.io/",
@ -21,17 +21,16 @@
"test": "npm run build"
},
"dependencies": {
"primer-base": "^1.2.1",
"primer-box": "^2.2.1",
"primer-buttons": "^2.1.1",
"primer-forms": "^1.1.1",
"primer-layout": "^1.1.1",
"primer-navigation": "^1.1.1",
"primer-support": "^4.1.1",
"primer-table-object": "^1.1.1",
"primer-tooltips": "^1.1.1",
"primer-truncate": "^1.1.1",
"primer-utilities": "^4.4.1"
},
"devDependencies": {}
"primer-base": "^1.3.0",
"primer-box": "^2.3.0",
"primer-buttons": "^2.2.0",
"primer-forms": "^1.2.0",
"primer-layout": "^1.2.0",
"primer-navigation": "^1.2.0",
"primer-support": "^4.2.0",
"primer-table-object": "^1.2.0",
"primer-tooltips": "^1.2.0",
"primer-truncate": "^1.2.0",
"primer-utilities": "^4.5.0"
}
}

View File

@ -1,5 +1,5 @@
{
"version": "9.1.1",
"version": "9.2.0",
"name": "primer-css",
"description": "Primer is the CSS framework that powers GitHub's front-end design. Primer-css 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://primercss.io/",
@ -21,35 +21,34 @@
"test": "npm run build"
},
"dependencies": {
"primer-alerts": "^1.2.1",
"primer-avatars": "^1.1.1",
"primer-base": "^1.2.1",
"primer-blankslate": "^1.1.1",
"primer-box": "^2.2.1",
"primer-breadcrumb": "^1.1.1",
"primer-buttons": "^2.1.1",
"primer-cards": "^0.2.1",
"primer-core": "^6.1.1",
"primer-forms": "^1.1.1",
"primer-labels": "^1.2.1",
"primer-layout": "^1.1.1",
"primer-markdown": "^3.4.1",
"primer-marketing": "^5.1.1",
"primer-marketing-support": "^1.1.0",
"primer-marketing-type": "^1.1.1",
"primer-marketing-utilities": "^1.1.1",
"primer-navigation": "^1.1.1",
"primer-page-headers": "^1.1.1",
"primer-page-sections": "^1.1.1",
"primer-product": "^5.1.1",
"primer-support": "^4.1.1",
"primer-table-object": "^1.1.1",
"primer-tables": "^1.1.1",
"primer-tooltips": "^1.1.1",
"primer-truncate": "^1.1.1",
"primer-utilities": "^4.4.1"
"primer-alerts": "^1.3.0",
"primer-avatars": "^1.2.0",
"primer-base": "^1.3.0",
"primer-blankslate": "^1.2.0",
"primer-box": "^2.3.0",
"primer-breadcrumb": "^1.2.0",
"primer-buttons": "^2.2.0",
"primer-cards": "^0.3.0",
"primer-core": "^6.2.0",
"primer-forms": "^1.2.0",
"primer-labels": "^1.3.0",
"primer-layout": "^1.2.0",
"primer-markdown": "^3.5.0",
"primer-marketing": "^5.2.0",
"primer-marketing-support": "^1.2.0",
"primer-marketing-type": "^1.2.0",
"primer-marketing-utilities": "^1.2.0",
"primer-navigation": "^1.2.0",
"primer-page-headers": "^1.2.0",
"primer-page-sections": "^1.2.0",
"primer-product": "^5.2.0",
"primer-support": "^4.2.0",
"primer-table-object": "^1.2.0",
"primer-tables": "^1.2.0",
"primer-tooltips": "^1.2.0",
"primer-truncate": "^1.2.0",
"primer-utilities": "^4.5.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-forms",
"description": "Style individual form controls and utilize common layouts.",
"homepage": "http://primercss.io/",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "1.2.1",
"version": "1.3.0",
"name": "primer-labels",
"description": "Labels add metatdata or indicate status of items and navigational elements.",
"homepage": "http://primercss.io/",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-layout",
"description": "Containers, rows, and columns for creating page layout.",
"homepage": "http://primercss.io/",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "3.4.1",
"version": "3.5.0",
"name": "primer-markdown",
"description": "GitHub stylesheets for rendering markdown.",
"homepage": "https://github.com/primer/primer-markdown",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"github",
"markdown",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.0",
"version": "1.2.0",
"name": "primer-marketing-support",
"description": "Sass variables, mixins, and functions for use in our components.",
"homepage": "http://primercss.io/",
@ -18,7 +18,6 @@
"lint": "stylelint **/*.scss -s scss",
"test": "npm run lint"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-marketing-type",
"description": "Typography for marketing websites at GitHub",
"homepage": "http://primercss.io/",
@ -24,10 +24,9 @@
"test": "npm-run-all -s build lint test-docs"
},
"dependencies": {
"primer-marketing-support": "^1.1.0",
"primer-support": "^4.1.1"
"primer-marketing-support": "^1.2.0",
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"css",
"github",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-marketing-utilities",
"description": "Marketing specific immutable, atomic CSS classes",
"homepage": "http://primercss.io/",
@ -23,10 +23,9 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-marketing-support": "^1.1.0",
"primer-support": "^4.1.1"
"primer-marketing-support": "^1.2.0",
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "5.1.1",
"version": "5.2.0",
"name": "primer-marketing",
"description": "Primer CSS marketing packages",
"homepage": "http://primercss.io/",
@ -21,15 +21,14 @@
"test": "npm run build"
},
"dependencies": {
"primer-breadcrumb": "^1.1.1",
"primer-cards": "^0.2.1",
"primer-marketing-support": "^1.1.0",
"primer-marketing-type": "^1.1.1",
"primer-marketing-utilities": "^1.1.1",
"primer-page-headers": "^1.1.1",
"primer-page-sections": "^1.1.1",
"primer-support": "^4.1.1",
"primer-tables": "^1.1.1"
},
"devDependencies": {}
"primer-breadcrumb": "^1.2.0",
"primer-cards": "^0.3.0",
"primer-marketing-support": "^1.2.0",
"primer-marketing-type": "^1.2.0",
"primer-marketing-utilities": "^1.2.0",
"primer-page-headers": "^1.2.0",
"primer-page-sections": "^1.2.0",
"primer-support": "^4.2.0",
"primer-tables": "^1.2.0"
}
}

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-navigation",
"description": "Singular purpose and flexible navigation elements.",
"homepage": "http://primercss.io/",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-page-headers",
"description": "Jumbotrons, heroes, and featured content sections for marketing websites at GitHub.",
"homepage": "http://primercss.io/",
@ -23,10 +23,9 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-marketing-support": "^1.1.0",
"primer-support": "^4.1.1"
"primer-marketing-support": "^1.2.0",
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"css",
"flash",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-page-sections",
"description": "Styles to create distinct sections of marketing pages at GitHub.",
"homepage": "http://primercss.io/",
@ -23,10 +23,9 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-marketing-support": "^1.1.0",
"primer-support": "^4.1.1"
"primer-marketing-support": "^1.2.0",
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"css",
"github",

View File

@ -1,5 +1,5 @@
{
"version": "5.1.1",
"version": "5.2.0",
"name": "primer-product",
"description": "Primer CSS's product modules",
"homepage": "http://primercss.io/",
@ -21,12 +21,11 @@
"test": "npm run build"
},
"dependencies": {
"primer-alerts": "^1.2.1",
"primer-avatars": "^1.1.1",
"primer-blankslate": "^1.1.1",
"primer-labels": "^1.2.1",
"primer-markdown": "^3.4.1",
"primer-support": "^4.1.1"
},
"devDependencies": {}
"primer-alerts": "^1.3.0",
"primer-avatars": "^1.2.0",
"primer-blankslate": "^1.2.0",
"primer-labels": "^1.3.0",
"primer-markdown": "^3.5.0",
"primer-support": "^4.2.0"
}
}

View File

@ -1,5 +1,5 @@
{
"version": "4.1.1",
"version": "4.2.0",
"name": "primer-support",
"description": "Sass variables, mixins, and functions for use in our components.",
"homepage": "http://primercss.io/",
@ -18,7 +18,6 @@
"lint": "stylelint **/*.scss -s scss",
"test": "npm run lint"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-table-object",
"description": "A module for creating dynamically resizable elements that always sit on the same horizontal line.",
"homepage": "http://primercss.io/",
@ -24,9 +24,8 @@
"test": "npm-run-all -s build lint test-docs"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-tables",
"description": "Styles to display tabular data for marketing websites at GitHub.",
"homepage": "http://primercss.io/",
@ -23,10 +23,9 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-marketing-support": "^1.1.0",
"primer-support": "^4.1.1"
"primer-marketing-support": "^1.2.0",
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"css",
"github",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-tooltips",
"description": "Add tooltips built entirely in CSS to nearly any element.",
"homepage": "http://primercss.io/",
@ -24,9 +24,8 @@
"test": "npm-run-all -s build lint test-docs"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.2.0",
"name": "primer-truncate",
"description": "Shorten text with an ellipsis.",
"homepage": "http://primercss.io/",
@ -24,9 +24,8 @@
"test": "npm-run-all -s build lint test-docs"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -1,5 +1,5 @@
{
"version": "4.4.1",
"version": "4.5.0",
"name": "primer-utilities",
"description": "Immutable, atomic CSS classes to rapidly build product",
"homepage": "http://primercss.io/",
@ -23,9 +23,8 @@
"test": "npm-run-all -s build lint"
},
"dependencies": {
"primer-support": "^4.1.1"
"primer-support": "^4.2.0"
},
"devDependencies": {},
"keywords": [
"primer",
"css",

View File

@ -9,7 +9,7 @@
"release-pr": "script/release-pr",
"release-candidate": "script/release-candidate",
"release": "script/release",
"bump": "lerna publish --skip-git --skip-npm",
"bump": "lerna publish --skip-npm",
"test": "lerna run test"
},
"devDependencies": {

View File

@ -2,8 +2,6 @@
set -e
echo "👌 Publishing release candidate..."
PATH=$(npm bin):$PATH
package=primer-css
npm_tag=rc
@ -26,7 +24,7 @@ fi
# determine the
next_version=$(
semver --increment prerelease --preid $npm_tag $rc_version
$(npm bin)/semver --increment prerelease --preid $npm_tag $rc_version
)
echo "🤜 Next version: $package@$next_version"
@ -61,6 +59,6 @@ done
$(dirname $0)/notify pending
# note: this should NOT fail, so --bail=true applies
lerna exec -- npm publish --tag=$npm_tag
$(npm bin)/lerna exec -- npm publish --tag=$npm_tag
$(dirname $0)/notify success

View File

@ -2,11 +2,9 @@
set -e
echo "🐦 Publishing PR (canary) release..."
PATH=$(npm bin):$PATH
# script/notify pending
lerna publish --npm-tag=pr --canary --no-git $@
$(npm bin)/lerna publish --npm-tag=pr --canary --no-git $@
$(dirname $0)/notify success