Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 16 additions & 9 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,26 +49,33 @@ 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

Good pull requests—patches, improvements, new features—are a fantastic help. They should remain focused in scope and avoid containing unrelated commits.

**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).

Expand Down
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 2 additions & 3 deletions modules/primer-alerts/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions modules/primer-avatars/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions modules/primer-base/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions modules/primer-blankslate/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions modules/primer-box/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
7 changes: 3 additions & 4 deletions modules/primer-breadcrumb/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions modules/primer-buttons/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
7 changes: 3 additions & 4 deletions modules/primer-cards/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
27 changes: 13 additions & 14 deletions modules/primer-core/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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"
}
}
57 changes: 28 additions & 29 deletions modules/primer-css/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions modules/primer-forms/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions modules/primer-labels/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions modules/primer-layout/package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand All @@ -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",
Expand Down
Loading