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.3.0 #425

Merged
merged 35 commits into from
Jan 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ff7e843
reduce opacity to increaes color contrast
broccolini Dec 22, 2017
97a8383
darken button focus color
broccolini Dec 22, 2017
3185623
Point style field to build file
muan Jan 3, 2018
663bcfb
Happy new year
jonrohan Jan 3, 2018
d1d7f88
forgot about $spacer-12
gladwearefriends Jan 4, 2018
00d3ab5
Merge pull request #420 from primer/2018
broccolini Jan 5, 2018
aed9ddd
Merge branch 'release-10.3.0' into marketing-spacing-scale-woops
broccolini Jan 5, 2018
2532182
Merge pull request #424 from primer/marketing-spacing-scale-woops
broccolini Jan 5, 2018
d475d35
add em spacer variables to primer-support
broccolini Jan 5, 2018
1a9c1bb
move em-spacers below spacers and update with new variables
broccolini Jan 5, 2018
919110a
tweaks to em-spacer docs
broccolini Jan 5, 2018
1660918
combine spacing variables and spacing scale docs
broccolini Jan 5, 2018
1613139
add em unit
broccolini Jan 5, 2018
e633a2d
update components to use em spacer variables:
broccolini Jan 5, 2018
7304bf7
Merge branch 'release-10.3.0' into muan-patch-1
broccolini Jan 5, 2018
e291421
Merge pull request #416 from primer/muan-patch-1
broccolini Jan 6, 2018
9c4c641
Adding version to the title
jonrohan Jan 9, 2018
e2a0c89
Pulling in markdown components from all the rest of the modules
jonrohan Jan 9, 2018
b3fde27
Merge branch 'release-10.3.0' into btn_contrast
broccolini Jan 10, 2018
f64f6ab
Merge branch 'release-10.3.0' into btn_contrast
broccolini Jan 10, 2018
f1abbe2
increase input font-size to 16px on mobile
broccolini Jan 11, 2018
7e8a063
moving this script release order
jonrohan Jan 12, 2018
52e89b1
I want to see git status
jonrohan Jan 12, 2018
d413ec3
Upgrade lerna
jonrohan Jan 12, 2018
5927c06
Revert this script
jonrohan Jan 12, 2018
5335beb
Pin to specific version
jonrohan Jan 12, 2018
01f84f9
Merge pull request #432 from primer/wt_build
jonrohan Jan 12, 2018
b860097
Missed this one
jonrohan Jan 13, 2018
ddf774c
Merge pull request #427 from primer/markdown_stories
jonrohan Jan 13, 2018
37a4787
Merge pull request #430 from primer/input_fs
broccolini Jan 13, 2018
4bf14c4
Merge pull request #426 from primer/em_spacers
broccolini Jan 13, 2018
1de8a9f
Merge pull request #418 from primer/btn_contrast
broccolini Jan 16, 2018
cc3d0f9
add change to test changelog
broccolini Jan 17, 2018
30e51ab
add changelog
broccolini Jan 17, 2018
a98c029
Publish
broccolini Jan 17, 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
3 changes: 2 additions & 1 deletion .storybook/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import React from 'react'
import { configure, addDecorator } from '@storybook/react'
import { setOptions } from '@storybook/addon-options'
import '../modules/primer/index.scss'
import { version } from '../modules/primer/package.json'

setOptions({
name: 'Primer',
name: `Primer v${version}`,
url: 'http://primer.github.io/',
showDownPanel: false,
})
Expand Down
2 changes: 1 addition & 1 deletion .storybook/lib/storiesFromMarkdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const htmlParser = new htmlToReact.Parser()

const railsOcticonToReact = (html) => {
// <%= octicon "tools" %> to <Octicon name="tools" />
const octre = /<%= octicon ["']([a-z\-]+)["'][^%]*%>/gi
const octre = /<%= octicon[\(\s]["']([a-z\-]+)["'][^%]*%>/gi
html = html.replace(octre, (match, name) => {
return ReactDOMServer.renderToStaticMarkup(<Octicon name={name} />)
})
Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
# 10.3.0 (2018-01-17)

#### :rocket: Enhancement
* [#426](https://github.com/primer/primer/pull/426) Add em spacer variables. ([@broccolini](https://github.com/broccolini))
* [#430](https://github.com/primer/primer/pull/430) Increase input font-size to 16px on mobile. ([@broccolini](https://github.com/broccolini))

#### :bug: Bug Fix
* [#416](https://github.com/primer/primer/pull/416) Point style field to build file in subhead component. ([@muan](https://github.com/muan))
* [#424](https://github.com/primer/primer/pull/424) Add missing $spacer-12 in $marketingSpacers variable. ([@gladwearefriends](https://github.com/gladwearefriends))

#### :nail_care: Polish
* [#418](https://github.com/primer/primer/pull/418) Button color contrast improvements. ([@broccolini](https://github.com/broccolini))

#### :memo: Documentation
* [#427](https://github.com/primer/primer/pull/427) Adding stories from markdown for the other modules that didn't have any stories. ([@jonrohan](https://github.com/jonrohan))

#### :house: Internal
* [#420](https://github.com/primer/primer/pull/420) Update licenses to 2018 🎊. ([@jonrohan](https://github.com/jonrohan))

#### Committers: 4
- Catherine Bui ([gladwearefriends](https://github.com/gladwearefriends))
- Diana Mounter ([broccolini](https://github.com/broccolini))
- Jon Rohan ([jonrohan](https://github.com/jonrohan))
- [muan](https://github.com/muan)

# 10.2.0 (2017-12-11)

#### :rocket: Enhancement
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) 2017 GitHub Inc.
Copyright (c) 2018 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
2 changes: 1 addition & 1 deletion modules/primer-alerts/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 GitHub Inc.
Copyright (c) 2018 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
2 changes: 1 addition & 1 deletion modules/primer-alerts/lib/flash.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
}

.warning {
padding: 0.5em;
padding: $em-spacer-5;
margin-bottom: 0.8em;
font-weight: $font-weight-bold;
background-color: $yellow-100;
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.4",
"version": "1.5.5",
"name": "primer-alerts",
"description": "Flash messages, or alerts, inform users of successful or pending actions.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -28,7 +28,7 @@
"test": "../../script/npm-run-all build lint"
},
"dependencies": {
"primer-support": "4.5.1"
"primer-support": "4.5.2"
},
"keywords": [
"alerts",
Expand Down
2 changes: 1 addition & 1 deletion modules/primer-avatars/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 GitHub Inc.
Copyright (c) 2018 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
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.1",
"version": "1.5.2",
"name": "primer-avatars",
"description": "Basic styles for user profile avatars.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -28,7 +28,7 @@
"test": "../../script/npm-run-all build lint"
},
"dependencies": {
"primer-support": "4.5.1"
"primer-support": "4.5.2"
},
"keywords": [
"avatars",
Expand Down
2 changes: 1 addition & 1 deletion modules/primer-base/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 GitHub Inc.
Copyright (c) 2018 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
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.6.2",
"version": "1.6.3",
"name": "primer-base",
"description": "CSS to reset the browsers default styles",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -28,7 +28,7 @@
"test": "../../script/npm-run-all build lint"
},
"dependencies": {
"primer-support": "4.5.1"
"primer-support": "4.5.2"
},
"keywords": [
"primer",
Expand Down
2 changes: 1 addition & 1 deletion modules/primer-blankslate/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 GitHub Inc.
Copyright (c) 2018 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
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.4",
"version": "1.4.5",
"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 @@ -28,7 +28,7 @@
"test": "../../script/npm-run-all build lint"
},
"dependencies": {
"primer-support": "4.5.1"
"primer-support": "4.5.2"
},
"keywords": [
"primer",
Expand Down
2 changes: 1 addition & 1 deletion modules/primer-box/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 GitHub Inc.
Copyright (c) 2018 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
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.4",
"version": "2.5.5",
"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 @@ -28,7 +28,7 @@
"test": "../../script/npm-run-all build lint"
},
"dependencies": {
"primer-support": "4.5.1"
"primer-support": "4.5.2"
},
"keywords": [
"primer",
Expand Down
2 changes: 1 addition & 1 deletion modules/primer-branch-name/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 GitHub Inc.
Copyright (c) 2018 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
9 changes: 6 additions & 3 deletions modules/primer-branch-name/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,19 @@ status: Stable

Branch names can be a link name or not:

```html
```html title="Branch name"
<span class="branch-name">a_new_feature_branch</span>
```

```html title="Branch name with link"
<a href="#url" class="branch-name">a_new_feature_branch</a>
```

You may also include an octicon before the branch name text:

```html
```html title="Branch name with icon"
<span class="branch-name">
<%= octicon("git-branch") width:16 height:16 %>
<%= octicon("git-branch", width:16, height:16) %>
a_new_feature_branch
</span>
```
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.2",
"version": "1.0.3",
"name": "primer-branch-name",
"description": "A nice, consistent way to display branch names.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -29,7 +29,7 @@
"test": "../../script/npm-run-all build lint test-docs"
},
"dependencies": {
"primer-support": "4.5.1"
"primer-support": "4.5.2"
},
"keywords": [
"github",
Expand Down
10 changes: 10 additions & 0 deletions modules/primer-branch-name/stories.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react'
import { storiesOf } from '@storybook/react'
import storiesFromMarkdown from '../../.storybook/lib/storiesFromMarkdown'

const stories = storiesOf('Branch Name', module)

storiesFromMarkdown(require.context('.', true, /\.md$/))
.forEach(({title, story}) => {
stories.add(title, story)
})
2 changes: 1 addition & 1 deletion modules/primer-breadcrumb/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 GitHub Inc.
Copyright (c) 2018 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
4 changes: 2 additions & 2 deletions modules/primer-breadcrumb/lib/breadcrumb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
list-style: none;

&::after {
padding-right: 0.5em;
padding-left: 0.5em;
padding-right: $em-spacer-5;
padding-left: $em-spacer-5;
color: $border-gray;
content: "/";
}
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.0",
"version": "1.5.1",
"name": "primer-breadcrumb",
"description": "Breadcrumb navigation for pages with parents / grandparents.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -29,7 +29,7 @@
"test": "../../script/npm-run-all build lint test-docs"
},
"dependencies": {
"primer-support": "4.5.1"
"primer-support": "4.5.2"
},
"keywords": [
"breadcrumb",
Expand Down
2 changes: 1 addition & 1 deletion modules/primer-buttons/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 GitHub Inc.
Copyright (c) 2018 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
4 changes: 2 additions & 2 deletions modules/primer-buttons/lib/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
i {
font-style: normal;
font-weight: $font-weight-semibold;
opacity: 0.6;
opacity: 0.75;
}

.octicon {
Expand Down Expand Up @@ -90,7 +90,7 @@

// Large button adds more padding around text. Use font-size utils to increase font-size.. e.g, <p class="text-gamma"><button class="btn btn-large btn-primary" type="button">Big green button</button></p>
.btn-large {
padding: 0.75em 1.25em;
padding: $em-spacer-6 1.25em;
font-size: inherit;
border-radius: 6px;
}
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.5.2",
"version": "2.5.3",
"name": "primer-buttons",
"description": "A collection of buttons used for primary and secondary actions.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -28,7 +28,7 @@
"test": "../../script/npm-run-all build lint"
},
"dependencies": {
"primer-support": "4.5.1"
"primer-support": "4.5.2"
},
"keywords": [
"primer",
Expand Down
2 changes: 1 addition & 1 deletion modules/primer-core/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 GitHub Inc.
Copyright (c) 2018 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
2 changes: 1 addition & 1 deletion modules/primer-core/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Primer-core
* http://primer.github.io
*
* Released under MIT license. Copyright (c) 2017 GitHub Inc.
* Released under MIT license. Copyright (c) 2018 GitHub Inc.
*/

// Primer master file
Expand Down
26 changes: 13 additions & 13 deletions modules/primer-core/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.6.1",
"version": "6.7.0",
"name": "primer-core",
"description": "Primer's core modules",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -27,17 +27,17 @@
"lint": "../../script/lint-scss"
},
"dependencies": {
"primer-base": "1.6.2",
"primer-box": "2.5.4",
"primer-breadcrumb": "1.5.0",
"primer-buttons": "2.5.2",
"primer-forms": "2.0.2",
"primer-layout": "1.4.4",
"primer-navigation": "1.5.2",
"primer-support": "4.5.1",
"primer-table-object": "1.4.4",
"primer-tooltips": "1.5.1",
"primer-truncate": "1.4.4",
"primer-utilities": "4.8.4"
"primer-base": "1.6.3",
"primer-box": "2.5.5",
"primer-breadcrumb": "1.5.1",
"primer-buttons": "2.5.3",
"primer-forms": "2.1.0",
"primer-layout": "1.4.5",
"primer-navigation": "1.5.3",
"primer-support": "4.5.2",
"primer-table-object": "1.4.5",
"primer-tooltips": "1.5.2",
"primer-truncate": "1.4.5",
"primer-utilities": "4.8.5"
}
}
2 changes: 1 addition & 1 deletion modules/primer-forms/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 GitHub Inc.
Copyright (c) 2018 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
Loading