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.

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

Release 10.0.0 #354

Merged
merged 235 commits into from
Nov 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
235 commits
Select commit Hold shift + click to select a range
2cf338e
Do not suppress opacity transition for tooltipped-no-delay
astorije Aug 5, 2017
7f3553a
remove -webkit-text-decoration-skip override
antons Aug 13, 2017
4d603c9
initial import of branch-name component
shawnbot Sep 11, 2017
7a72228
clean up doc tests
shawnbot Sep 11, 2017
aac4825
add branch-name SCSS and readme
shawnbot Sep 11, 2017
a1d8cae
treat ERB helpers as class name providers
shawnbot Sep 11, 2017
03a20fc
Merge remote-tracking branch 'origin/dev' into import-branch-name
shawnbot Sep 11, 2017
6498a0f
import subhead component (product)
shawnbot Sep 11, 2017
71dc6f0
import input-group SCSS
shawnbot Sep 12, 2017
2daba56
Merge branch 'stories-reorg' into import-input-groups
shawnbot Sep 12, 2017
fc09b75
stub out input group stories
shawnbot Sep 12, 2017
8c62991
export Octicon react element
shawnbot Sep 12, 2017
9d703e0
add copy to clipboard input group story
shawnbot Sep 12, 2017
15a4016
add forms decorator to wrap w/<form></form>
shawnbot Sep 12, 2017
470662f
nix form.p-4
shawnbot Sep 12, 2017
82b92d4
wrap everything in div.p-4
shawnbot Sep 12, 2017
6e807ef
rename input-groups -> input-group
shawnbot Sep 12, 2017
270bd62
remove unnecessary <div> and <form> wrappers
shawnbot Sep 12, 2017
05aeff3
Merge branch 'dev' into import-input-groups
shawnbot Sep 12, 2017
346ed4c
Merge pull request #307 from astorije/patch-1
broccolini Sep 15, 2017
c8f0c8e
Merge remote-tracking branch 'origin/dev' into release-10.0.0
shawnbot Sep 22, 2017
a0ba6cd
Merge branch 'release-10.0.0' into import-subhead
shawnbot Sep 22, 2017
711035e
Merge branch 'release-10.0.0' into import-branch-name
shawnbot Sep 22, 2017
107d446
Merge branch 'dev' into import-input-groups
shawnbot Sep 22, 2017
906bd9b
Merge pull request #341 from primer/import-branch-name
broccolini Sep 25, 2017
a11cdd0
add per-module RC bump script
shawnbot Sep 22, 2017
58f6a8f
nicer output
shawnbot Sep 22, 2017
9156588
use bump-rc script for each module
shawnbot Sep 22, 2017
fe7aa58
don't exit form script/release-candidate
shawnbot Sep 25, 2017
f1aec75
fix the publish tag
shawnbot Sep 25, 2017
3f0f629
match all modules :facepalm:
shawnbot Sep 26, 2017
4d419bb
semver is dumb
shawnbot Sep 26, 2017
bd3e187
actually add branch-name to product
shawnbot Sep 26, 2017
a466d91
alphanumeric semver sorting is dumb; just get the last one
shawnbot Sep 26, 2017
5b4759e
change li break to handle safari user stylesheet bug
Oct 5, 2017
fa1ab24
Removing before after padding hack
jonrohan Oct 5, 2017
6626240
adding markdown story to storybook
jonrohan Oct 5, 2017
8145e90
Add details reset rules to primer
muan Oct 16, 2017
6e350f8
Added `Fixes #` into the PR template
agisilaos Oct 19, 2017
1c9fbfa
New reponsive layout/position utils
Oct 19, 2017
93170a2
Docs for responsive positioning
Oct 19, 2017
62f552c
border-white fade css
Oct 19, 2017
57075a2
border-white-fade docs
Oct 19, 2017
12bd248
hover grow css
Oct 19, 2017
c18b8d0
hover grow docs
Oct 19, 2017
aee1483
Add fade out css
Oct 19, 2017
3d47e86
Add fade out docs
Oct 19, 2017
2530d4c
Add circle class
Oct 19, 2017
17542a2
Add utilities and marketing utilities to storybook
Oct 19, 2017
4c713a9
Rename headings to fix storybook errors
Oct 19, 2017
9e13c39
Make a checklist out of the 3 sentences
agisilaos Oct 19, 2017
abc2175
oops, put the ) in the right spot
Oct 19, 2017
cbae32d
fix border examples
Oct 19, 2017
c814e56
show more examples of positioning in docs
Oct 19, 2017
9060f34
include scss (might need that) & add margin to make example look better
Oct 19, 2017
478f764
Added a space between the # and the (
agisilaos Oct 19, 2017
ce1a6f8
Add underline nav styles and import file
ampinsk Oct 20, 2017
67fe320
Add octicon styles to prototype
ampinsk Oct 20, 2017
346992a
Add prototyping cases
ampinsk Oct 20, 2017
ca5a104
Add docs
ampinsk Oct 20, 2017
5dbec5c
Merge pull request #374 from agisilaos/agis/prtemplate
jonrohan Oct 23, 2017
936a8fe
Move underline nav section in docs
ampinsk Oct 23, 2017
23e4fbc
Merge branch 'master' into dev
jonrohan Oct 24, 2017
26561e1
Merge branch 'master' into release-10.0.0
jonrohan Oct 24, 2017
fcfb2ea
Moving primer-breadcrumbs to core
jonrohan Sep 6, 2017
0838061
add primer-dropdown@1.0.0 to primer-css deps
shawnbot Aug 30, 2017
9b9d73b
add primer-support
shawnbot Aug 30, 2017
1f699de
migrate dropdown docs to README
shawnbot Aug 30, 2017
1ba86ce
update dropdown README
shawnbot Aug 30, 2017
2cb0c5b
add dropdown-menu-no-overflow and dropdown-signout docs
shawnbot Aug 30, 2017
f97d178
nix unnecessary link ref
shawnbot Aug 30, 2017
24f18b7
nix github source url
shawnbot Aug 30, 2017
51ca5c9
add dropdown to primer-product
shawnbot Aug 30, 2017
96c0152
move primer-support import to index.scss
shawnbot Aug 30, 2017
6f06e24
update primer.category to "product"
shawnbot Aug 30, 2017
344e19a
move intro paragraph to docs section
shawnbot Aug 30, 2017
4b4d6d7
clean up new dropdown examples
shawnbot Aug 30, 2017
b15d80f
whitespace consistency
shawnbot Aug 30, 2017
d9a5ab4
update copyright year to 2017
shawnbot Aug 31, 2017
cb66b17
primer-dropdown 1.0.0 -> 0.1.0
shawnbot Aug 31, 2017
6e89e95
Make a checklist out of the 3 sentences
agisilaos Oct 19, 2017
d6bcb2b
Added a space between the # and the (
agisilaos Oct 19, 2017
0771124
Fix versions to current versions
jonrohan Oct 25, 2017
4b5d810
Removing primer-cards module
jonrohan Oct 25, 2017
4a8f0bb
Removing .form-cards styles
jonrohan Oct 25, 2017
ea3ed60
Init .Popover
brandonrosage Oct 26, 2017
dbec2ae
Add reset properties to .btn-link
JasonEtco Oct 27, 2017
99a8337
Add btn-link story
JasonEtco Oct 27, 2017
295ff78
Remove btn states from story
JasonEtco Oct 27, 2017
17d1a9f
Stable CSS-only 'Popover' component
brandonrosage Oct 27, 2017
6e8c00b
Merge branch 'release-10.0.0' into import-subhead
jonrohan Oct 27, 2017
a6a10fb
Updating year and changelog
jonrohan Oct 27, 2017
bc0bea4
Importing subhead in product
jonrohan Oct 27, 2017
ac032e1
Merge pull request #342 from primer/import-subhead
jonrohan Oct 27, 2017
af82d99
Merge branch 'release-10.0.0' into deprecate-modules
jonrohan Oct 27, 2017
4b4d1cf
Merge pull request #379 from primer/deprecate-modules
jonrohan Oct 27, 2017
958afb1
Merge branch 'release-10.0.0' into import-input-groups
jonrohan Oct 27, 2017
80515ee
Revert these changes to focus on input groups only
jonrohan Oct 27, 2017
5d9fb5b
Remove react inline svg and import octicons css
jonrohan Oct 27, 2017
34355d1
Updating changelog
jonrohan Oct 27, 2017
07b2ae0
Merge pull request #344 from primer/import-input-groups
jonrohan Oct 27, 2017
4df2cf4
Adding a test to check for the current year in the license and source…
jonrohan Oct 27, 2017
de420d9
abstracting out year regex
jonrohan Oct 27, 2017
87240f8
Merge pull request #384 from primer/year_test
jonrohan Oct 27, 2017
50313f1
Updating changelog
jonrohan Oct 27, 2017
4500309
Refactored to include `.Popover-message`
brandonrosage Oct 27, 2017
ad5fa52
Merge branch 'release-10.0.0' into underline-nav
jonrohan Oct 27, 2017
36565dc
Linting fixes
jonrohan Oct 27, 2017
a7a8a4f
STorybook menu naming revision
brandonrosage Oct 27, 2017
760ceb1
Tweak caret alignment to overlap border.
brandonrosage Oct 27, 2017
f6dde1e
Using storiesfrommarkdown
jonrohan Oct 28, 2017
8d0a13e
add border radius rule to base to override chroma macOS
broccolini Nov 1, 2017
fd6b4a2
add button type selector to button stories
broccolini Nov 1, 2017
e22561a
add changelog back to primer-css module so can pull into docs
broccolini Nov 1, 2017
613afcf
update changelogs
broccolini Nov 1, 2017
1fefabb
add ava to dev dependencies for styelint config
broccolini Nov 2, 2017
fa6701d
point build status badge at primer-css
broccolini Nov 2, 2017
43b8b8e
Publish alpha release any time we're not on a release branch or master
jonrohan Nov 2, 2017
65a1be7
add publish script as fall back
broccolini Nov 2, 2017
1f9ada9
Publish alpha release any time we're not on a release branch or master
jonrohan Nov 2, 2017
b93f58e
Updating storiesFromMarkdown to read in rails octicons helper and rep…
jonrohan Nov 2, 2017
1779f0e
Use const here.
jonrohan Nov 2, 2017
e314b6f
Merge pull request #389 from primer/alpha_release_always
jonrohan Nov 2, 2017
13bf797
make Popover positioning more flexible
brandonrosage Nov 2, 2017
41f157b
add marketing buttons to primer-marketing-buttons
gladwearefriends Sep 6, 2017
a6db97c
add import to primer-marketing
gladwearefriends Sep 6, 2017
2e039ad
update read me for buttons
gladwearefriends Sep 6, 2017
bfeb14a
actually update the marketing buttons readme for reals
gladwearefriends Sep 6, 2017
ece1533
update package.json
gladwearefriends Sep 6, 2017
d16903a
use variables and move .btn-large into primer-marketing-buttons
gladwearefriends Sep 6, 2017
234e3b2
edit dependencies, does not need primer-marketing-support
gladwearefriends Sep 6, 2017
ca26cfc
edit package.json
gladwearefriends Sep 13, 2017
1078145
update readme to pass test
gladwearefriends Sep 13, 2017
da1c1c4
Updating scripts
jonrohan Oct 27, 2017
0383073
Updating changelog
jonrohan Oct 27, 2017
a1918c9
Using variable for fade
jonrohan Oct 27, 2017
69685d9
Updating version
jonrohan Oct 27, 2017
f1681f3
add primer-marketing-buttons to primer-marketing package.json
gladwearefriends Nov 2, 2017
22c7f75
add stories.js for storybook
gladwearefriends Nov 3, 2017
f85d54c
Add support for all container classes; add support for right + actions
ampinsk Nov 3, 2017
84efc60
Merge branch 'underline-nav' of https://github.com/primer/primer-css …
ampinsk Nov 3, 2017
573b961
Fix spacing
ampinsk Nov 3, 2017
d23ce98
Support for top, right, left, bottom caret orientations
brandonrosage Nov 3, 2017
529fdb6
build error fix
brandonrosage Nov 3, 2017
4c6e9f0
Addresses @broccolini's feedback
brandonrosage Nov 3, 2017
921fef6
Update docs
ampinsk Nov 3, 2017
8fec79d
Remove stories to stop things from being broken
Nov 3, 2017
c46fe01
Marketing utils story
Nov 3, 2017
7079001
Add more stories
Nov 3, 2017
4f1b326
Change h4s to h2s
JasonEtco Nov 4, 2017
057fbf5
Add btn-link to README
JasonEtco Nov 4, 2017
e01c8f5
Remove all-buttons example block
JasonEtco Nov 4, 2017
35bc23f
Consistent headings
JasonEtco Nov 4, 2017
1a9ad0f
Add TOC
JasonEtco Nov 4, 2017
a5c661a
Improve .btn-link description
JasonEtco Nov 4, 2017
12adf11
Tweak a heading
JasonEtco Nov 4, 2017
c2f6984
incorporate @broccolini's feedback
Nov 6, 2017
80f0616
Update naming and docs
ampinsk Nov 6, 2017
49e98ce
Don't let extra attributes not match
jonrohan Nov 6, 2017
c584ebe
Merge pull request #390 from primer/fix_rails_react_octicons
jonrohan Nov 6, 2017
dc3ab87
Tweak caret alignment
brandonrosage Nov 6, 2017
751b999
Remove mr-1 from octicon component style
ampinsk Nov 6, 2017
8336983
Update docs
ampinsk Nov 6, 2017
d7d54d5
Merge branch 'release-10.0.0' into underline-nav
jonrohan Nov 6, 2017
d4e6313
Reconciling documentation differences from Style Guide
brandonrosage Nov 6, 2017
6ae4002
Addresses @broccolini's feedback
brandonrosage Nov 6, 2017
fc30322
rm changelog update
gladwearefriends Nov 7, 2017
1c81f3c
rm btn-blurple
gladwearefriends Nov 7, 2017
cea6e67
use border variables
gladwearefriends Nov 7, 2017
60a8d27
move btn-large back into primer-buttons, update docs
gladwearefriends Nov 7, 2017
171e0b6
move btn-large test into primer-buttons’ stories.js
gladwearefriends Nov 7, 2017
43e12e8
only btn-orange is being added
gladwearefriends Nov 7, 2017
7f9fc05
test wants an example of counter
gladwearefriends Nov 7, 2017
f270f97
Update docs
ampinsk Nov 7, 2017
0ffc472
Merge branch 'underline-nav' of https://github.com/primer/primer-css …
ampinsk Nov 7, 2017
fd80450
Pulling primer-dropdown out of release 10
jonrohan Nov 7, 2017
73b5205
Setting up peer dependency for marketing buttons, fixing generator de…
jonrohan Nov 7, 2017
ee50150
add peer dependency for Box component
broccolini Nov 7, 2017
dac9464
add toc
broccolini Nov 7, 2017
15d89f3
missed a couple of spacers
broccolini Nov 7, 2017
6c4d49d
revert changelog
jonrohan Nov 7, 2017
06feed4
Merge branch 'release-10.0.0' into popover
broccolini Nov 7, 2017
324c230
Merge pull request #337 from primer/add-marketing-buttons
jonrohan Nov 7, 2017
19e684f
Merge pull request #377 from primer/underline-nav
broccolini Nov 7, 2017
f7a9309
missed a comma
broccolini Nov 7, 2017
4938e89
update year on license
broccolini Nov 7, 2017
823e4b7
Merge pull request #383 from primer/popover
broccolini Nov 7, 2017
24763f4
move button story to base
broccolini Nov 8, 2017
3031c97
remove changelog from primer-css because it should copy over automati…
broccolini Nov 8, 2017
4d6138c
remove ava from dev dependencies
broccolini Nov 8, 2017
30aee1a
Merge branch 'release-10.0.0' into btn_fix
broccolini Nov 8, 2017
c6abba0
move dev dependency to top level
jonrohan Nov 8, 2017
6817dff
Merge pull request #388 from primer/btn_fix
broccolini Nov 8, 2017
e042b5e
Revert "Add reset properties to .btn-link"
JasonEtco Nov 8, 2017
603dee4
Merge branch 'release-10.0.0' into btn-link-fixes
broccolini Nov 8, 2017
7c6f49c
Merge branch 'release-10.0.0' into code_padding
jonrohan Nov 8, 2017
dea33f2
add link to docs folder
broccolini Nov 8, 2017
d14f8f8
Merge branch 'new-marketing-utils' of https://github.com/primer/prime…
broccolini Nov 8, 2017
82fd962
Merge pull request #375 from primer/new-marketing-utils
broccolini Nov 8, 2017
00b5483
Merge pull request #382 from JasonEtco/btn-link-fixes
broccolini Nov 8, 2017
866e4da
Merge pull request #359 from feministy/markdown-list-wrapping
broccolini Nov 8, 2017
800b108
Merge pull request #320 from antons/webkit-text-decoration-skip
broccolini Nov 8, 2017
cce0269
Using variables
jonrohan Nov 8, 2017
607ce88
Merge branch 'release-10.0.0' into code_padding
jonrohan Nov 8, 2017
5cf4b24
Missing closing tag
jonrohan Nov 8, 2017
8c06f60
Merge pull request #360 from primer/code_padding
jonrohan Nov 8, 2017
8624389
Merge pull request #371 from primer/muan/details
broccolini Nov 9, 2017
fdabbb6
Renaming primer-css to primer
jonrohan Nov 9, 2017
a26b42d
Can't check for `primer-` anymore
jonrohan Nov 9, 2017
c6794cf
Fixing the top and bottom left caret position
jonrohan Nov 9, 2017
1133891
use spacer instead of static value
broccolini Nov 9, 2017
67065d4
fix popover modifier classnames
broccolini Nov 9, 2017
289c470
update modifier class names in readme docs
broccolini Nov 10, 2017
4ad1338
Updating the changelog style to lerna-changelog output
jonrohan Nov 10, 2017
3bdc412
whoops fix class name that I broke
broccolini Nov 10, 2017
0d415fe
Adding lerna-changelog to travis output
jonrohan Nov 10, 2017
7baafaf
some emoji to be safe
jonrohan Nov 10, 2017
cd35ae0
It's a design system
jonrohan Nov 10, 2017
6284eb2
Merge pull request #395 from primer/rename_primer-css
jonrohan Nov 10, 2017
047e904
Merge pull request #396 from primer/new_changelog_style
jonrohan Nov 10, 2017
80f5393
Changing the changelog repo field
jonrohan Nov 10, 2017
83ddb97
Adding lerna-changelog to release-candidate script
jonrohan Nov 10, 2017
fd32b1c
Need to output the result
jonrohan Nov 10, 2017
96389ed
missing ticks to close code snippet
broccolini Nov 10, 2017
4c9bdf1
move utilities stories into stories folder
broccolini Nov 10, 2017
b599949
Merge branch 'release-10.0.0' of https://github.com/primer/primer-css…
broccolini Nov 10, 2017
b2d85bd
remove first require context so ordering in nav is more senseible
broccolini Nov 10, 2017
97b7264
lowercase u
broccolini Nov 10, 2017
4e301f4
Updating changelog
jonrohan Nov 13, 2017
4ad77f2
add margin so can see hover-grow animation
broccolini Nov 13, 2017
ad1c6b2
add toc to form docs
broccolini Nov 13, 2017
80e5bda
tweak text and add thanks to changelog
broccolini Nov 13, 2017
9474918
add primer-breadcrum pr to changelog
broccolini Nov 14, 2017
a3bb1b7
word this better
broccolini Nov 14, 2017
080a797
Publish
broccolini Nov 14, 2017
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
8 changes: 4 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[fork]: https://github.com/github/primer/fork
[pr]: https://github.com/github/primer/compare
[style]: http://primercss.io/guidelines/
[style]: http://primer.github.io/guidelines/

Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great.

Expand Down Expand Up @@ -59,16 +59,16 @@ Good pull requests—patches, improvements, new features—are a fantastic help.

### Updating Primer modules

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.
Anyone can open a pull request on Primer. 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).
1. Fork and clone [this repository](https://github.com/primer/primer).
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 pass, you should see a status check telling you which alpha version of primer 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.
Expand Down
6 changes: 4 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
First, change the base branch from "master" to "dev".
- [ ] First, change the base branch from "master" to "dev".

↑ Next, briefly describe your proposal in the title.
- [ ] Next, briefly describe your proposal in the title.

- [ ] Fixes: # (type an issue number after the # if applicable)

Finally, tell us more about the change here, in the description.

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ node_modules
build
_site
*.lerna_backup
.changelog
6 changes: 3 additions & 3 deletions .storybook/Octicon.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React from 'react'
import {storiesOf} from '@storybook/react'
import octicons from 'octicons'
import SVGInline from 'react-svg-inline'

const Octicon = (props) => {
export const Octicon = (props) => {
const {name} = props
if (name in octicons) {
return <SVGInline svg={octicons[name].toSVG(props)} />
const svg = octicons[name].toSVG(props)
return <span dangerouslySetInnerHTML={ {__html: svg } } />
} else {
throw new Error(`No such octicon: "${name}"!`)
}
Expand Down
5 changes: 2 additions & 3 deletions .storybook/config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react'
import { configure, addDecorator } from '@storybook/react'
import { setOptions } from '@storybook/addon-options'
import '../modules/primer-css/index.scss'
import '../modules/primer/index.scss'

setOptions({
name: 'Primer',
url: 'http://primercss.io/',
url: 'http://primer.github.io/',
showDownPanel: false,
})

Expand All @@ -16,7 +16,6 @@ addDecorator(story => (
))

const contexts = [
require.context('.', true, /\.js$/),
require.context('../modules', true, /stories.*\.js$/),
]

Expand Down
14 changes: 13 additions & 1 deletion .storybook/lib/storiesFromMarkdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,23 @@ import select from 'unist-util-select'
import findBefore from 'unist-util-find-before'
import htmlToReact from 'html-to-react'
import parsePairs from 'parse-pairs'
import React from 'react'
import ReactDOMServer from 'react-dom/server'
import {Octicon} from '../Octicon'

const htmlParser = new htmlToReact.Parser()

const railsOcticonToReact = (html) => {
// <%= octicon "tools" %> to <Octicon name="tools" />
const octre = /<%= octicon ["']([a-z\-]+)["'][^%]*%>/gi
html = html.replace(octre, (match, name) => {
return ReactDOMServer.renderToStaticMarkup(<Octicon name={name} />)
})
return html
}

const nodeToStory = (node, file) => {
const html = node.value
const html = railsOcticonToReact(node.value)
const element = htmlParser.parse(html)
const pairs = node.lang.replace(/^html\s*/, '')
const attrs = pairs.length ? parsePairs(pairs) : {}
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview-head.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<link rel="stylesheet" href="https://unpkg.com/primer-css@9.2.0/build/build.css">
<link rel="stylesheet" href="https://unpkg.com/octicons@7.0.1/build/build.css">
<script src="https://github.com/site/assets/styleguide.js" async></script>
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ env:
- secure: "EZewKKWQXmtCwPtYrPZq4OQblv2OyXR61qBIl3pOxGNVG2BCjD6VOgSaiYqkA9Qbt+ihfwQkiiLvTB68gbvRSiBFV9i+XLzKzt4S8CDI5RhTLAxZB3eQFVZRYzldchzWI4sdNhTvYS1kYXmsXQZD6vJmPSnFvOI/ddfzqvnNL4M="
# github
- secure: "J+1oWjvvXjyrwkY/4IFWKdN/weFmQcPwlRuFG4R0Gb3rYe4nqtC9l68sJvmS8asc8dQMhOhcUZCH6sjvo7l2WD4NuK4umPSbs+rJNUsfbvH4pZjStQIj/3ll1OfQelGDWAYQWhIfciYY4F3Bp0ZWTfKOppLQ2AVIYu1fPVXDdlo="
# github changelog
- secure: "KcGydAqL7ryDh2rTJJB4wU8NE5BRtnrRXDEcPBScSscO3zFsHXHBDvvO04B/9hFVatXzGYXmkn+FZ0P9QikhvebzdwwyqUG2SKFiHhMvbX0m0WtAhn5NqDuKU1r5qy5YQ18r/tiLfC9GSAlEpfLAH58pwpcn8srV3Mn/yKvlrfs="

script:
- npm test

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
# copy the CHANGELOG.md primer for publishing
- cp CHANGELOG.md modules/primer
- script/after_success

deploy:
Expand Down
62 changes: 55 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,51 @@
# 10.0.0 (2017-11-13)

#### :boom: Breaking Change
* [#395](https://github.com/primer/primer/pull/395) Renaming primer-css to primer. ([@jonrohan](https://github.com/jonrohan))
* [#379](https://github.com/primer/primer/pull/379) Deprecating primer-cards and form-cards. ([@jonrohan](https://github.com/jonrohan))
* [#336](https://github.com/primer/primer/pull/336) Move `primer-breadcrumbs` from marketing to core ([@jonrohan]((https://github.com/jonrohan))

#### :rocket: Enhancement
* [#371](https://github.com/primer/primer/pull/371) Add .details-reset. ([@muan](https://github.com/muan))
* [#375](https://github.com/primer/primer/pull/375) New utilities & docs - fade out, hover grow, border white fade, responsive positioning, and circle. ([@sophshep](https://github.com/sophshep))
* [#383](https://github.com/primer/primer/pull/383) Add 'Popover' component. ([@brandonrosage](https://github.com/brandonrosage))
* [#377](https://github.com/primer/primer/pull/377) Refactor and add underline nav component. ([@ampinsk](https://github.com/ampinsk))
* [#337](https://github.com/primer/primer/pull/337) Add marketing buttons to primer-marketing. ([@gladwearefriends](https://github.com/gladwearefriends))
* [#342](https://github.com/primer/primer/pull/342) Add Subhead component. ([@shawnbot](https://github.com/shawnbot))
* [#341](https://github.com/primer/primer/pull/341) Add branch-name component from github/github. ([@shawnbot](https://github.com/shawnbot))

#### :bug: Bug Fix
* [#360](https://github.com/primer/primer/pull/360) Remove ::before ::after padding hack on markdown. ([@jonrohan](https://github.com/jonrohan))
* [#320](https://github.com/primer/primer/pull/320) Remove -webkit-text-decoration-skip override. ([@antons](https://github.com/antons))
* [#359](https://github.com/primer/primer/pull/359) Change markdown li break to handle Safari 10.x user stylesheet bug. ([@feministy](https://github.com/feministy))
* [#388](https://github.com/primer/primer/pull/388) Button border-radius fix to override Chroma 62. ([@broccolini](https://github.com/broccolini))
* [#307](https://github.com/primer/primer/pull/307) Do not suppress opacity transition for tooltipped-no-delay. ([@astorije](https://github.com/astorije))

#### :house: Internal
* [#396](https://github.com/primer/primer/pull/396) Use lerna-changelog to generate a changelog. ([@jonrohan](https://github.com/jonrohan))
* [#382](https://github.com/primer/primer/pull/382) Update Button docs. ([@JasonEtco](https://github.com/JasonEtco))
* [#390](https://github.com/primer/primer/pull/390) Updating `storiesFromMarkdown` to read in rails Octicons helper and replace with react component. ([@jonrohan](https://github.com/jonrohan))
* [#389](https://github.com/primer/primer/pull/389) Publish alpha release any time we're not on a release branch or master. ([@jonrohan](https://github.com/jonrohan))
* [#384](https://github.com/primer/primer/pull/384) Add test to check for the current year in the license and source. ([@jonrohan](https://github.com/jonrohan))
* [#374](https://github.com/primer/primer/pull/374) Improve Pull Request template. ([@agisilaos](https://github.com/agisilaos))

#### Committers: 13
- Agisilaos Tsaraboulidis ([agisilaos](https://github.com/agisilaos))
- Amanda Pinsker ([ampinsk](https://github.com/ampinsk))
- Anton Sotkov ([antons](https://github.com/antons))
- Brandon Rosage ([brandonrosage](https://github.com/brandonrosage))
- Catherine Bui ([gladwearefriends](https://github.com/gladwearefriends))
- Diana Mounter ([broccolini](https://github.com/broccolini))
- Jason Etcovitch ([JasonEtco](https://github.com/JasonEtco))
- Jon Rohan ([jonrohan](https://github.com/jonrohan))
- Jérémie Astori ([astorije](https://github.com/astorije))
- Mu-An ✌️ Chiou ([muan](https://github.com/muan))
- Shawn Allen ([shawnbot](https://github.com/shawnbot))
- Sophie Shepherd ([sophshep](https://github.com/sophshep))
- liz abinante! ([feministy](https://github.com/feministy))

**Special thanks to @shaharke for transferring ownership of the Primer npm package to us so that we could make the rename happen!** :heart:

# 9.6.0

### Added
Expand All @@ -24,7 +72,7 @@
- Add deprecation warnings for `primer-cards` and `primer-forms/lib/form-validation.scss` #347 (these will be removed in v10.0.0)

### Changes
- Update npm metadata for `primer-css`, `primer-core`, `primer-product`, and `primer-marketing` #328
- Update npm metadata for `primer`, `primer-core`, `primer-product`, and `primer-marketing` #328
- Remove `HEAD` heading from the changelog #327

# 9.3.0
Expand All @@ -36,7 +84,7 @@
## Changes
- Removes `docs` from `gitignore`
- Removes the `^` from all dependencies so that we can publish exact versions
- Consolidates release notes from various sources into one changelog located in `/modules/primer-css/CHANGELOG.md`
- Consolidates release notes from various sources into one changelog located in `/modules/primer/CHANGELOG.md`

# 9.2.0

Expand All @@ -47,7 +95,7 @@
## 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
- Replace most static `font-size`, `font-weight`, and `line-height` CSS property values with their [SCSS variable equivalents](https://github.com/primer/primer/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
Expand Down Expand Up @@ -94,7 +142,7 @@ This release also includes major improvements to our Travis build scripts to aut

We discovered that `primer-core` specified and outdated version of `primer-base` in it's dependencies. The outdated version did not have `normalize.scss` included which could cause some issues. This has issue occurred during v7.0.0 when creating the new monorepo. Also fixes repo urls in `package.json` for individual packages.

See PR [#243](https://github.com/primer/primer-css/pull/243)
See PR [#243](https://github.com/primer/primer/pull/243)

## Changes

Expand Down Expand Up @@ -139,7 +187,7 @@ See PR [#243](https://github.com/primer/primer-css/pull/243)

# 8.0.0 - Imports

Fixes issues with the ordering of imports in each of our meta-packages. See PR [#239](https://github.com/primer/primer-css/pull/239)
Fixes issues with the ordering of imports in each of our meta-packages. See PR [#239](https://github.com/primer/primer/pull/239)


## Changes
Expand All @@ -155,7 +203,7 @@ Fixes issues with the ordering of imports in each of our meta-packages. See PR [

# 7.0.0 - Monorepo

In an effort to improve our publishing workflow we turned Primer CSS into a monorepo, made this repo the source of truth for Primer by removing Primer modules from GitHub, and setup Lerna for managing multiple packages and maintaining independent versioning for all our modules.
In an effort to improve our publishing workflow we turned Primer into a monorepo, made this repo the source of truth for Primer by removing Primer modules from GitHub, and setup Lerna for managing multiple packages and maintaining independent versioning for all our modules.

This is exciting because:

Expand All @@ -164,7 +212,7 @@ This is exciting because:
- we no longer have files like package.json, scripts, and readme's in the GitHub app that don't really belong there
- **we can accept pull requests from external contributors** again!

See PR for more details on this change: https://github.com/primer/primer-css/pull/230
See PR for more details on this change: https://github.com/primer/primer/pull/230

## Other changes:

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 GitHub Inc.
Copyright (c) 2017 GitHub Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
# Primer CSS
# Primer

[![npm version](http://img.shields.io/npm/v/primer-css.svg)](https://www.npmjs.org/package/primer-css)
[![Build Status](https://travis-ci.org/primer/primer-css.svg?branch=master)](https://travis-ci.org/primer/primer-css)
[![npm version](http://img.shields.io/npm/v/primer.svg)](https://www.npmjs.org/package/primer)
[![Build Status](https://travis-ci.org/primer/primer.svg?branch=master)](https://travis-ci.org/primer/primer)

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.
Primer is the design system that powers GitHub. 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.

## Packages

The Primer CSS repo is managed as a monorepo that is composed of many npm packages.
The Primer repo is managed as a monorepo that is composed of many npm packages.

### Core Packages

| Package | Version |
|---|---|
| **[primer-css](/modules/primer-css)** <br />Includes all 23 packages | [![npm](http://img.shields.io/npm/v/primer-css.svg)](https://www.npmjs.com/package/primer-css) |
| **[primer](/modules/primer)** <br />Includes all 23 packages | [![npm](http://img.shields.io/npm/v/primer.svg)](https://www.npmjs.com/package/primer) |
| [primer-core](/modules/primer-core) | [![npm](http://img.shields.io/npm/v/primer-core.svg)](https://www.npmjs.com/package/primer-core) |
| [primer-product](/modules/primer-product) | [![npm](http://img.shields.io/npm/v/primer-product.svg)](https://www.npmjs.com/package/primer-product) |
| [primer-marketing](/modules/primer-marketing) | [![npm](http://img.shields.io/npm/v/primer-marketing.svg)](https://www.npmjs.com/package/primer-marketing) |

## Install

This repository is distributed with [npm][npm]. After [installing npm][install-npm], you can install `primer-css` with this command.
This repository is distributed with [npm][npm]. After [installing npm][install-npm], you can install `primer` with this command.

```sh
$ npm install --save primer-css
$ npm install --save primer
```

## Usage

The source files included are written in [Sass][sass] (SCSS). After [installing](#install) with npm, you can add your project's `node_modules` directory to your Sass [include paths](https://github.com/sass/node-sass#includepaths) (AKA [load paths](http://technology.customink.com/blog/2014/10/09/understanding-and-using-sass-load-paths/) in Ruby), then import it like this:

```scss
@import "primer-css/index.scss";
@import "primer/index.scss";
```

You can import individual Primer modules by installing them with npm, for instance:
Expand All @@ -46,10 +46,10 @@ Then, you would import the module with:
@import "primer-navigation/index.scss";
```

Or, while you're figuring out which modules you need, you can import them directly from the `primer-css` [`packages` directory](./packages) like so:
Or, while you're figuring out which modules you need, you can import them directly from the `primer` [`packages` directory](./packages) like so:

```scss
@import "primer-css/modules/primer-navigation/index.css";
@import "primer/modules/primer-navigation/index.css";
```


Expand All @@ -70,7 +70,7 @@ You can read more about primer in the [docs][docs].
[MIT](./LICENSE) &copy; [GitHub](https://github.com/)

[primer]: https://github.com/primer/primer
[docs]: http://primercss.io/
[docs]: http://primer.github.io/
[npm]: https://www.npmjs.com/
[install-npm]: https://docs.npmjs.com/getting-started/installing-node
[sass]: http://sass-lang.com/
12 changes: 12 additions & 0 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,17 @@
"modules/*",
"tools/*"
],
"changelog": {
"repo": "primer/primer",
"labels": {
"Tag: Breaking Change": ":boom: Breaking Change",
"Tag: Enhancement": ":rocket: Enhancement",
"Tag: Bug Fix": ":bug: Bug Fix",
"Tag: Polish": ":nail_care: Polish",
"Tag: Documentation": ":memo: Documentation",
"Tag: Internal": ":house: Internal"
},
"cacheDir": ".changelog"
},
"version": "independent"
}
2 changes: 1 addition & 1 deletion modules/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Primer modules

Primer CSS is monorepo composed of 23 packages which can be installed altogether or individually via npm. We group our packages into 3 meta-packages which you can install individually: [primer-core](primer-core), [primer-product](primer-product), and [primer-marketing](primer-marketing). Install [primer-css](primer-css) if you want to install all 23 packages.
Primer is monorepo composed of 23 packages which can be installed altogether or individually via npm. We group our packages into 3 meta-packages which you can install individually: [primer-core](primer-core), [primer-product](primer-product), and [primer-marketing](primer-marketing). Install [primer](primer) if you want to install all 23 packages.
10 changes: 5 additions & 5 deletions modules/primer-alerts/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Primer CSS Alerts
# Primer Alerts

[![npm version](http://img.shields.io/npm/v/primer-alerts.svg)](https://www.npmjs.org/package/primer-alerts)
[![Build Status](https://travis-ci.org/primer/primer-css.svg?branch=master)](https://travis-ci.org/primer/primer-css)
[![Build Status](https://travis-ci.org/primer/primer.svg?branch=master)](https://travis-ci.org/primer/primer)

> Flash messages, or alerts, inform users of successful or pending actions. Use them sparingly. Don’t show more than one at a time.

This repository is a module of the full [primer-css][primer-css] repository.
This repository is a module of the full [primer][primer] repository.

## Install

Expand Down Expand Up @@ -144,8 +144,8 @@ A flash message that is full width and removes border and border radius.

[MIT](./LICENSE) &copy; [GitHub](https://github.com/)

[primer-css]: https://github.com/primer/primer
[docs]: http://primercss.io/
[primer]: https://github.com/primer/primer
[docs]: http://primer.github.io/
[npm]: https://www.npmjs.com/
[install-npm]: https://docs.npmjs.com/getting-started/installing-node
[sass]: http://sass-lang.com/
Loading