Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper-breakpoint-sass-2.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
scottnath committed Dec 12, 2016
2 parents f153109 + d376959 commit 72065fa
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8,275 deletions.
18 changes: 1 addition & 17 deletions .travis.yml
Expand Up @@ -11,28 +11,12 @@ sudo: true
cache:
directories:
- node_modules
- $HOME/.yarn-cache
services:
- postgresql

#########################
## Install Yarn
##
## From https://yarnpkg.com/en/docs/install-ci#travis-tab
#########################
before_install:
# Repo for Yarn
- sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
- echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
- sudo apt-get update -qq
- sudo apt-get install -y -qq yarn

install: yarn

before_script:
- psql -c 'create database travis_ci_test;' -U postgres

script: yarn test
- npm prune

after_success:
- npm run coverage
Expand Down
4 changes: 4 additions & 0 deletions lib/routes/data/styles.js
Expand Up @@ -63,4 +63,8 @@ module.exports = {
],
],
},
alertData: {
for: '00eef724-7cbd-47f5-a735-630510f39711',
value: 'Oops! The email or password you entered is incorrect. Please try again.',
},
};
4 changes: 2 additions & 2 deletions views/components/alert.html
@@ -1,3 +1,3 @@
{% macro alert(for, type, value) %}
<p class="alert--{{type | upper}}" role="alert" for="{{for}}">{{value}}</p>
{% macro alert(data) %}
<p class="form--alert" role="alert" for="{{data.for}}">{{data.value}}</p>
{% endmacro %}
6 changes: 6 additions & 0 deletions views/styles.html
Expand Up @@ -328,6 +328,12 @@ <h1 class="base--h2">Form elements</h1>
</form>
</section>

<section class="_style-guide--group">
<h2 class="_style-guide--title">Alerts</h2>
{% from "components/alert.html" import alert %}
{{alert(alertData)}}
</section>

<section class="_style-guide--group">
<h2 class="_style-guide--title">Tabular Data</h2>
{% from "components/table.html" import table %}
Expand Down

0 comments on commit 72065fa

Please sign in to comment.