Skip to content

Commit

Permalink
Merge pull request #1589 from 18F/bh-undo-style-guide-npm
Browse files Browse the repository at this point in the history
Revert "Merge pull request #1582 from 18F/bh-use-style-guide"
  • Loading branch information
hursey013 authored Aug 4, 2017
2 parents 537584e + 6bce21d commit 5094016
Show file tree
Hide file tree
Showing 47 changed files with 44 additions and 19 deletions.
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,11 @@ Vagrantfile
/kitchen/cookbooks
/log/*
/private_certs/*
/public/*.ico
/public/*.png
/public/*.svg
/public/browserconfig.xml
/public/manifest.json
/public/system
/public/user_flows
/spec/tmp
/test
/tmp/*
/vendor/assets/fonts
/vendor/bundle
/node_modules

Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ before_install:
- nvm install stable
- nvm use stable
- npm install
- npm run build
# Install PhantomJS 2.1.1 manually
- "export PHANTOMJS_VERSION=2.1.1"
- "phantomjs --version"
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ WORKDIR /upaya

COPY package.json /upaya
RUN npm install
RUN npm run build

COPY Gemfile /upaya
COPY Gemfile.lock /upaya
Expand Down
1 change: 0 additions & 1 deletion bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ Dir.chdir APP_ROOT do
run 'gem install foreman --conservative && gem update foreman'
run "bundle check || bundle install"
run "npm install"
run "npm run build"

puts "\n== Preparing database =="
run "bin/rake db:reset RAILS_ENV=development"
Expand Down
9 changes: 0 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
"node": "~4.4.x",
"npm": "~3.8.x"
},
"scripts": {
"build": "npm run clean && npm run make-dirs && npm run copy",
"clean": "rm -rf ./vendor/assets/fonts && rm -f ./public/*.ico && rm -f ./public/*.png && rm -f ./public/*.svg && rm -f ./public/browserconfig.xml && rm -f ./public/manifest.json",
"copy": "npm run copy-font && npm run copy-favicons",
"copy-favicons": "cp node_modules/identity-style-guide/src/favicons/* ./public",
"copy-font": "cp node_modules/identity-style-guide/src/font/* ./vendor/assets/fonts/",
"make-dirs": "mkdir -p ./vendor/assets/fonts"
},
"dependencies": {
"app": "^0.1.0",
"basscss-sass": "^3.0.0",
Expand All @@ -22,7 +14,6 @@
"field-kit": "^2.1.0",
"focus-trap": "^2.3.0",
"hint.css": "^2.3.2",
"identity-style-guide": "^0.2.3",
"libphonenumber-js": "^0.4.23",
"normalize.css": "^4.2.0",
"sinon": "^1.17.7",
Expand Down
Binary file added public/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#2b5797</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file added public/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/favicon.ico
Binary file not shown.
12 changes: 12 additions & 0 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "login.gov",
"icons": [
{
"src": "\/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image\/png"
}
],
"theme_color": "#ffffff",
"display": "standalone"
}
Binary file added public/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions public/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion spec/svg_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'rails_helper'

RSpec.describe 'SVG files' do
Dir[Rails.root.join('**', '*.svg')].reject { |f| f.include?('node_modules') }.each do |svg_path|
Dir[Rails.root.join('**', '*.svg')].each do |svg_path|
relative_path = svg_path.sub(Rails.root.to_s, '')

describe relative_path do
Expand Down
Binary file added vendor/assets/fonts/merriweather-bold-webfont.eot
Binary file not shown.
Binary file added vendor/assets/fonts/merriweather-bold-webfont.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 5094016

Please sign in to comment.