diff --git a/.travis.yml b/.travis.yml index c5b99cec2c..211582c331 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,11 @@ node_js: script: - npm run build +deploy: + - on: + branch: master + provider: script + script: script/deploy --token="$NOW_TOKEN" + notifications: slack: github:4OisIoqZYyMlWcw3hFtZgbmh diff --git a/now.json b/now.json index 6ccbdcecf7..5538955058 100644 --- a/now.json +++ b/now.json @@ -1,3 +1,9 @@ { - "name": "primer-style" + "name": "primer-style", + "scale": { + "sfo": { + "min": 1, + "max": 1 + } + } } diff --git a/pages/_app.js b/pages/_app.js index 45fe0c43bc..93781507df 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -1,13 +1,15 @@ import React from 'react' -import {Box} from '@primer/components' +import {Box, BaseStyles} from '@primer/components' import {ThemeProvider} from 'emotion-theming' import theme from '../src/theme.js' const Page = props => ( - - {props.children} - + + + {props.children} + + ) diff --git a/script/deploy b/script/deploy index d12b9f12a5..04b1813075 100755 --- a/script/deploy +++ b/script/deploy @@ -1,8 +1,6 @@ #!/bin/bash set -e -deployment=primer-style.now.sh -domain=primer.style -now -now alias $deployment -now scale $deployment sfo 1 -now alias $domain -r rules.json +now $* +# XXX this needs to match up with the last `dest` in rules.json +now $* alias primer-style.now.sh +now $* alias primer.style -r rules.json diff --git a/src/AtomPlugins.js b/src/AtomPlugins.js index d5e7532954..8a9bcbcfe4 100644 --- a/src/AtomPlugins.js +++ b/src/AtomPlugins.js @@ -7,17 +7,16 @@ import ButtonOutline from './ButtonOutline' const AtomPlugins = props => ( - - - - + + + + A better development experience with Atom Install this custom Atom package to autocomplete classnames for Primer CSS and rails helpers for Octicons Install package Get Atom apm install autocomplete-primer - ) diff --git a/src/svg/Atom.svg b/src/svg/Atom.svg index 979b1c78af..e874356963 100644 --- a/src/svg/Atom.svg +++ b/src/svg/Atom.svg @@ -5,25 +5,19 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + diff --git a/webpack.config.js b/webpack.config.js index 68eac67823..56a2b1db16 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,7 +3,12 @@ module.exports = { rules: [ { test: /\.svg$/, - use: ['@svgr/webpack'] + use: { + loader: '@svgr/webpack', + options: { + svgo: false + } + } } ] }