Merge branch 'master' into cleanup-marketing

Author: Sophie Shepherd

.storybook/config.js

@@ -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,
 })

.storybook/lib/storiesFromMarkdown.js

@@ -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} />)
   })

CHANGELOG.md

@@ -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

LICENSE

@@ -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

modules/primer-alerts/LICENSE

@@ -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

modules/primer-alerts/lib/flash.scss

@@ -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;

modules/primer-alerts/package.json

@@ -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/",
@@ -28,7 +28,7 @@
     "test": "../../script/npm-run-all build lint"
   },
   "dependencies": {
-    "primer-support": "4.5.1"
+    "primer-support": "4.5.2"
   },
   "keywords": [
     "alerts",

modules/primer-avatars/LICENSE

@@ -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

modules/primer-avatars/package.json

@@ -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/",
@@ -28,7 +28,7 @@
     "test": "../../script/npm-run-all build lint"
   },
   "dependencies": {
-    "primer-support": "4.5.1"
+    "primer-support": "4.5.2"
   },
   "keywords": [
     "avatars",

modules/primer-base/LICENSE

@@ -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