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

Minor Release Tracking PR 10.9.0 #556

Merged
merged 81 commits into from
Oct 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
bf42bd3
use code-blocks
shawnbot Sep 21, 2017
32ae3ff
remove btn-outline-blue docs references
shawnbot Jun 20, 2018
6ccfe8e
remove btn-secondary references
shawnbot Jun 20, 2018
a6c8d85
clean up tooltip storybook JS
shawnbot Jun 20, 2018
79856df
Adding user details to storybook publish script
jonrohan Jul 3, 2018
f3c9bca
support empty string in breakpoint() mixin
shawnbot Jul 18, 2018
92a2cef
add $responsive-variants map
shawnbot Jul 18, 2018
b632983
add docs for $responsive-variants
shawnbot Jul 18, 2018
182cd2e
use $responsive-variants for .float-*
shawnbot Jul 18, 2018
94748cf
use $responsive-variants and list for .d-*
shawnbot Jul 18, 2018
f3b8e57
use $responsive-variants for .direction-*
shawnbot Jul 18, 2018
957e55c
use $responsive-variants in .border-*, .rounded-*;
shawnbot Jul 18, 2018
2a8647f
add .rounded-<edge> utility docs
shawnbot Jul 18, 2018
cff39b5
line up border-color util parens
shawnbot Jul 18, 2018
6bf88ce
use $responsive-variants for margin utils
shawnbot Jul 18, 2018
c73a52b
use $responsive-variants for padding utils
shawnbot Jul 18, 2018
ac762d2
fix #472
shawnbot Jul 18, 2018
55cde57
remove variable interpolations in padding utils
shawnbot Jul 18, 2018
3bdccf9
add caution bits for $responsive-variants
shawnbot Jul 18, 2018
034e76a
nix unnecessary interpolations in comments
shawnbot Jul 18, 2018
05c8d29
use $responsive-variants for flex utils
shawnbot Jul 18, 2018
4b6cdb0
use $responsive-variants for .text-*
shawnbot Jul 18, 2018
7341f7f
normalize whitespace
shawnbot Jul 18, 2018
4124a31
update package-lock.json
shawnbot Jul 20, 2018
37d05fe
Fix typo
mderriey Jul 30, 2018
1a5f832
init
Aug 3, 2018
f3c9882
"Add !important for [hidden] cause attribute/UA style should take pre…
muan Aug 8, 2018
d012d50
Merge pull request #557 from muan/muan/hidden
jonrohan Aug 9, 2018
6d5983f
Merge remote-tracking branch 'origin/master' into responsive-variants
shawnbot Aug 23, 2018
314eeb4
move responsive border docs from marketing to core
shawnbot Aug 23, 2018
eea1415
[breaking] remove responsive borders from marketing-utilities
shawnbot Aug 23, 2018
92fd60c
move responsive borders from marketing into primer-utilities
shawnbot Aug 23, 2018
1312222
run node 8 to match .nvmrc
shawnbot Aug 24, 2018
6d22c21
Merge branch 'release-10.9.0' into storybook_user
shawnbot Oct 5, 2018
7bb6137
add space in 10.9.0 heading
shawnbot Oct 5, 2018
4bfe369
Merge pull request #550 from mderriey/patch-1
shawnbot Oct 5, 2018
2ebc81a
Merge branch 'release-10.9.0' into responsive-variants
shawnbot Oct 15, 2018
7c3957b
Merge branch 'fix-bootstrap' into release-10.9.0
shawnbot Oct 16, 2018
96d1e4f
make mx-auto responsive a la #577
shawnbot Oct 16, 2018
03eec2c
Merge branch 'master' into release-10.9.0
shawnbot Oct 17, 2018
a462f29
Merge branch 'release-10.9.0' into storybook_user
shawnbot Oct 17, 2018
be4153d
Merge pull request #530 from primer/storybook_user
shawnbot Oct 17, 2018
ef3260f
Merge branch 'release-10.9.0' into remove-invalid-button-classes
shawnbot Oct 17, 2018
a221b4f
Merge branch 'master' into shawnbot/code-blocks
shawnbot Oct 17, 2018
9c312fb
Merge remote-tracking branch 'origin/release-10.9.0' into responsive-…
shawnbot Oct 17, 2018
4c975aa
Update modules/primer-layout/lib/grid-offset.scss
Oct 17, 2018
957fa8b
rebuild package-lock
shawnbot Oct 17, 2018
c589db8
fix bad merge
shawnbot Oct 17, 2018
95027d5
remove redundant stylelint-config-primer
shawnbot Oct 17, 2018
16101e4
rebuild package-lock
shawnbot Oct 17, 2018
11fe822
Merge pull request #582 from primer/offset-is-important-v2
shawnbot Oct 17, 2018
b698fe0
Merge branch 'release-10.9.0' into shawnbot/code-blocks
shawnbot Oct 18, 2018
77507f0
Merge pull request #581 from primer/shawnbot/code-blocks
shawnbot Oct 18, 2018
3173ad7
Merge remote-tracking branch 'origin/release-10.9.0' into responsive-…
shawnbot Oct 18, 2018
6e98ed2
move links to the bottom
shawnbot Oct 18, 2018
52f468c
update package-lock
shawnbot Oct 18, 2018
3ef9525
add default stories.js to module template
shawnbot Oct 18, 2018
2b1e22d
Merge branch 'release-10.9.0' into new-module-stories
shawnbot Oct 18, 2018
399c6c5
Merge branch 'release-10.9.0' into remove-invalid-button-classes
shawnbot Oct 18, 2018
6f49e82
Merge pull request #580 from primer/remove-invalid-button-classes
shawnbot Oct 18, 2018
4cfa9b8
Merge branch 'release-10.9.0' into responsive-variants
shawnbot Oct 18, 2018
ae6bf0e
Merge branch 'release-10.9.0' into new-module-stories
shawnbot Oct 18, 2018
6a2d256
Merge pull request #545 from primer/responsive-variants
shawnbot Oct 18, 2018
a4b6676
Merge pull request #584 from primer/new-module-stories
shawnbot Oct 18, 2018
0864cf3
Hiding empty counters.
jonrohan Oct 19, 2018
9db5ba0
Merge pull request #586 from primer/empty_counter
shawnbot Oct 19, 2018
f49951e
add planned deprecation warnings
shawnbot Oct 22, 2018
4ce6bce
add note for moved responsive border utils
shawnbot Oct 22, 2018
72c9262
add missing semicolon
shawnbot Oct 22, 2018
aa8965a
add missing semicolon
shawnbot Oct 22, 2018
402ee27
add missing semicolon
shawnbot Oct 22, 2018
5e1593f
add missing semicolon
shawnbot Oct 22, 2018
82c0bd8
Publish
shawnbot Oct 22, 2018
8a0f5e6
update peer deps
shawnbot Oct 22, 2018
83cc7e8
update changelog
shawnbot Oct 23, 2018
2a84a10
publish dry-run to debug version issues
shawnbot Oct 23, 2018
882ff75
remove --since=master from lerna updated
shawnbot Oct 23, 2018
ff22d1a
tell lerna exactly which version we're comparing
shawnbot Oct 23, 2018
7d3bf1e
nix --dry-run from script/release-candidate in .travis.yml
shawnbot Oct 23, 2018
e90c0a7
go back to implied --since=master
shawnbot Oct 23, 2018
36ae59c
do a dry run of script/release-candidate to get this release out
shawnbot Oct 23, 2018
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
@@ -1,9 +1,5 @@
## Contributing

[fork]: https://github.com/primer/primer/fork
[pr]: https://github.com/primer/primer/compare
[style]: https://styleguide.github.com/primer/principles/

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

## Using the issue tracker
Expand Down Expand Up @@ -185,3 +181,7 @@ This section is targeted at maintainers of primer, to instruct them on the proce
- [Contributing to Open Source on GitHub](https://guides.github.com/activities/contributing-to-open-source/)
- [Using Pull Requests](https://help.github.com/articles/using-pull-requests/)
- [GitHub Help](https://help.github.com)

[fork]: https://github.com/primer/primer/fork
[pr]: https://github.com/primer/primer/compare
[style]: https://styleguide.github.com/primer/principles/
74 changes: 18 additions & 56 deletions .storybook/lib/storiesFromMarkdown.js
Original file line number Diff line number Diff line change
@@ -1,65 +1,27 @@
import remark from 'remark'
import parents from 'unist-util-parents'
import select from 'unist-util-select'
import findBefore from 'unist-util-find-before'
import parseCodeBlocks from 'code-blocks/lib/fromString'
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[\(\s]["']([a-z\-]+)["'][^%]*%>/gi
html = html.replace(octre, (match, name) => {
return ReactDOMServer.renderToStaticMarkup(<Octicon name={name} />)
})
return html
}

const parseBlockAttrs = (node, file) => {
const pairs = node.lang.replace(/^html\s*/, '')
const attrs = pairs.length ? parsePairs(pairs) : {}
attrs.title = attrs.title
|| getPreviousHeading(node)
|| `story @ ${file}:${node.position.start.line}`
node.block = attrs
return node
}

const nodeToStory = (node, file) => {
const html = railsOcticonToReact(node.value)
const {title} = node.block
const blockToStory = block => {
return {
title,
story: () => htmlParser.parse(html),
html,
file,
node,
title: block.title,
story: () => htmlParser.parse(block.value),
block,
}
}

const getPreviousHeading = node => {
const heading = findBefore(node.parent, node, 'heading')
return (heading && !heading.used)
? (heading.used = true, heading.children.map(c => c.value).join(''))
: undefined
}

export default req => {
return req.keys()
.filter(file => !file.match(/node_modules/))
.reduce((stories, file) => {
const content = req(file)
const ast = parents(remark.parse(content))
const path = file.replace(/^\.\//, '')
return stories.concat(
select(ast, 'code[lang^=html]')
.map(parseBlockAttrs)
.filter(({block}) => block.story !== "false")
.map(node => nodeToStory(node, path))
)
}, [])
export default function storiesFromMarkdown(req) {
return req.keys().reduce((stories, file) => {
const markdown = req(file)
const path = file.replace(/^\.\//, '')
const blocks = parseCodeBlocks(markdown, path)
.filter(block => {
// read: ```html *
// skip: ```html * story="false"
return block.lang === 'html' && block.info.story !== 'false'
})
.map(blockToStory)
return stories.concat(blocks)
}, [])
}
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 7
- 8

env:
global:
Expand All @@ -23,7 +23,7 @@ after_success:
deploy:
# publish release candidates on release branches
- provider: script
script: script/release-candidate
script: script/release-candidate --dry-run
skip_cleanup: true
on:
branch: release*
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
# 10.9.0
#### :rocket: Enhancement
* [#586](https://github.com/primer/primer/pull/586) Hiding .Counter component when it's empty.. ([@jonrohan](https://github.com/jonrohan))
* [#545](https://github.com/primer/primer/pull/545) Simplify responsive utilities with $responsive-variants. ([@shawnbot](https://github.com/shawnbot))
* [#557](https://github.com/primer/primer/pull/557) Add !important to [hidden]. ([@muan](https://github.com/muan))

#### :memo: Documentation
* [#580](https://github.com/primer/primer/pull/580) Remove invalid button classes. ([@shawnbot](https://github.com/shawnbot))

#### :house: Internal
* [#581](https://github.com/primer/primer/pull/581) Use code-blocks. ([@shawnbot](https://github.com/shawnbot))
* [#530](https://github.com/primer/primer/pull/530) Adding user details to storybook publish script. ([@jonrohan](https://github.com/jonrohan))
* [#579](https://github.com/primer/primer/pull/579) Upgrade to [email protected], rebuild package-lock. ([@shawnbot](https://github.com/shawnbot))

#### Committers: 5
- Jon Rohan ([jonrohan](https://github.com/jonrohan))
- Mickaël Derriey ([mderriey](https://github.com/mderriey))
- Mu-An Chiou ([muan](https://github.com/muan))
- Shawn Allen ([shawnbot](https://github.com/shawnbot))
- Sophie Shepherd ([sophshep](https://github.com/sophshep))

# 10.8.1
#### :bug: Bug Fix
* [#554](https://github.com/primer/primer/pull/554) Fixes peer dependency issues ([@emplums](https://github.com/emplums))
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-alerts/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.5.9",
"version": "1.5.10",
"name": "primer-alerts",
"description": "Flash messages, or alerts, inform users of successful or pending actions.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -33,7 +33,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "4.6.1"
},
"keywords": [
"alerts",
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-avatars/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.5.6",
"version": "1.5.7",
"name": "primer-avatars",
"description": "Basic styles for user profile avatars.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -30,7 +30,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "4.6.1"
},
"keywords": [
"avatars",
Expand Down
2 changes: 1 addition & 1 deletion modules/primer-base/lib/normalize.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ progress {

template, /* 1 */
[hidden] {
display: none;
display: none !important;
}

/* Links
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-base/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.7.4",
"version": "1.8.0",
"name": "primer-base",
"description": "CSS to reset the browsers default styles",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -34,7 +34,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "4.6.1"
},
"keywords": [
"primer",
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-blankslate/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.4.9",
"version": "1.4.10",
"name": "primer-blankslate",
"description": "Blankslates are for when there is a lack of content within a page or section.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -30,7 +30,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "4.6.1"
},
"keywords": [
"primer",
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-box/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.5.9",
"version": "2.5.10",
"name": "primer-box",
"description": "A module for creating rounded-corner boxes with options for headers, lists, and footers.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -30,7 +30,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "4.6.1"
},
"keywords": [
"primer",
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-branch-name/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.7",
"version": "1.0.8",
"name": "primer-branch-name",
"description": "A nice, consistent way to display branch names.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -31,7 +31,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "4.6.1"
},
"keywords": [
"github",
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-breadcrumb/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.5.5",
"version": "1.5.6",
"name": "primer-breadcrumb",
"description": "Breadcrumb navigation for pages with parents / grandparents.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -31,7 +31,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "4.6.1"
},
"keywords": [
"breadcrumb",
Expand Down
5 changes: 1 addition & 4 deletions modules/primer-buttons/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,23 +95,20 @@ Use `.btn-large` to increase the padding and border radius of a button. This is
[Type scale utilities](https://styleguide.github.com/primer/utilities/typography/#type-scale-utilities) can be used to alter the font-size if needed. Padding is applied in em's so that it scales proportionally with the font-size.

```html

<p>
<a class="btn btn-large btn-purple" href="#url" role="button">Large link button</a>
<button class="btn btn-large btn-outline-blue" type="button">Large button button</button>
<button class="btn btn-large" type="button">Large button button</button>
</p>

```

Use `.btn-large` with a type scale utility to transform the text to a bigger size.

```html

<p class="f3">
<a class="btn btn-large btn-purple" href="#url" role="button">Large link button</a>
<button class="btn btn-large btn-outline-blue" type="button">Large button button</button>
</p>

```

## Disabled state
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-buttons/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.6.0",
"version": "2.6.1",
"name": "primer-buttons",
"description": "A collection of buttons used for primary and secondary actions.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -30,7 +30,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "4.6.1"
},
"keywords": [
"primer",
Expand Down
11 changes: 1 addition & 10 deletions modules/primer-buttons/stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@ storiesOf('Button', module)
<button className='btn btn-primary disabled'>disabled</button>
</div>
))
.add('btn-secondary', () => (
<div className='p-4 d-flex flex-justify-between'>
<button className='btn btn-secondary'>Button</button>
<button className='btn btn-secondary hover'>hover</button>
<button className='btn btn-secondary focus'>focus</button>
<button className='btn btn-secondary selected'>selected</button>
<button className='btn btn-secondary disabled'>disabled</button>
</div>
))
.add('btn-danger', () => (
<div className='p-4 d-flex flex-justify-between'>
<button className='btn btn-danger'>Button</button>
Expand Down Expand Up @@ -62,7 +53,7 @@ storiesOf('Button', module)
.add('btn-large', () => (
<div className='f3 p-4'>
<a className="btn btn-large btn-purple mr-6" href="#url" role="button">Large link button</a>
<button className="btn btn-large btn-outline-blue" type="button">Large button button</button>
<button className="btn btn-large" type="button">Large button button</button>
</div>
))
.add('btn-link', () => (
Expand Down
28 changes: 14 additions & 14 deletions modules/primer-core/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.10.3",
"version": "6.10.4",
"name": "primer-core",
"description": "Primer's core modules",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -29,18 +29,18 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-base": "1.7.4",
"primer-box": "2.5.9",
"primer-breadcrumb": "1.5.5",
"primer-buttons": "2.6.0",
"primer-forms": "2.1.4",
"primer-layout": "1.4.9",
"primer-navigation": "1.5.7",
"primer-pagination": "1.0.3",
"primer-support": "4.6.0",
"primer-table-object": "1.4.9",
"primer-tooltips": "1.5.7",
"primer-truncate": "1.4.9",
"primer-utilities": "4.12.0"
"primer-base": "1.8.0",
"primer-box": "2.5.10",
"primer-breadcrumb": "1.5.6",
"primer-buttons": "2.6.1",
"primer-forms": "2.1.5",
"primer-layout": "1.5.0",
"primer-navigation": "1.5.8",
"primer-pagination": "1.0.4",
"primer-support": "4.6.1",
"primer-table-object": "1.4.10",
"primer-tooltips": "1.5.8",
"primer-truncate": "1.4.10",
"primer-utilities": "4.13.0"
}
}
4 changes: 2 additions & 2 deletions modules/primer-forms/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.1.4",
"version": "2.1.5",
"name": "primer-forms",
"description": "Style individual form controls and utilize common layouts.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -30,7 +30,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "4.6.1"
},
"keywords": [
"primer",
Expand Down
2 changes: 1 addition & 1 deletion modules/primer-labels/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Use `State--small` for a state label with reduced padding a smaller font size. T

## Counters

Use the `Counter` component to add a count to navigational elements and buttons. Counters come in 3 variations: the default `Counter` with a light gray background, `Counter--gray` with a dark-gray background and inverse white text, and `Counter--gray-light` with a light-gray background and dark gray text.
Use the `Counter` component to add a count to navigational elements and buttons. Counters come in 3 variations: the default `Counter` with a light gray background, `Counter--gray` with a dark-gray background and inverse white text, and `Counter--gray-light` with a light-gray background and dark gray text. When a counter is empty, it's visibility will be hidden.

```html title="Counter"
<span class="Counter">16</span>
Expand Down
Loading