diff --git a/.gitignore b/.gitignore index b18320e46b5..aebd7c9ecef 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/.travis.yml b/.travis.yml index a8d124fb2ba..6c27c2712e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/Dockerfile b/Dockerfile index 747766aa4a1..75f3b3a2a9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,6 @@ WORKDIR /upaya COPY package.json /upaya RUN npm install -RUN npm run build COPY Gemfile /upaya COPY Gemfile.lock /upaya diff --git a/bin/setup b/bin/setup index 345f0c965b4..bb38fe0124b 100755 --- a/bin/setup +++ b/bin/setup @@ -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" diff --git a/package.json b/package.json index 61621a20dca..5e216e62d1e 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png new file mode 100644 index 00000000000..ca68c112c39 Binary files /dev/null and b/public/android-chrome-192x192.png differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 00000000000..f1cb06f8693 Binary files /dev/null and b/public/apple-touch-icon.png differ diff --git a/public/browserconfig.xml b/public/browserconfig.xml new file mode 100644 index 00000000000..4a718762cf5 --- /dev/null +++ b/public/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #2b5797 + + + diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png new file mode 100644 index 00000000000..1d6eb611baa Binary files /dev/null and b/public/favicon-16x16.png differ diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png new file mode 100644 index 00000000000..238fa1caadb Binary files /dev/null and b/public/favicon-32x32.png differ diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 00000000000..7edfd94950f Binary files /dev/null and b/public/favicon.ico differ diff --git a/public/manifest.json b/public/manifest.json new file mode 100644 index 00000000000..f73ffef4e25 --- /dev/null +++ b/public/manifest.json @@ -0,0 +1,12 @@ +{ + "name": "login.gov", + "icons": [ + { + "src": "\/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image\/png" + } + ], + "theme_color": "#ffffff", + "display": "standalone" +} diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png new file mode 100644 index 00000000000..ace52e08cc1 Binary files /dev/null and b/public/mstile-150x150.png differ diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg new file mode 100644 index 00000000000..31e814a274f --- /dev/null +++ b/public/safari-pinned-tab.svg @@ -0,0 +1,22 @@ + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + + diff --git a/spec/svg_spec.rb b/spec/svg_spec.rb index 57c85e7fa9d..8030c85cc06 100644 --- a/spec/svg_spec.rb +++ b/spec/svg_spec.rb @@ -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 diff --git a/vendor/assets/fonts/merriweather-bold-webfont.eot b/vendor/assets/fonts/merriweather-bold-webfont.eot new file mode 100755 index 00000000000..c77b53bdd0c Binary files /dev/null and b/vendor/assets/fonts/merriweather-bold-webfont.eot differ diff --git a/vendor/assets/fonts/merriweather-bold-webfont.ttf b/vendor/assets/fonts/merriweather-bold-webfont.ttf new file mode 100755 index 00000000000..44f33c239f2 Binary files /dev/null and b/vendor/assets/fonts/merriweather-bold-webfont.ttf differ diff --git a/vendor/assets/fonts/merriweather-bold-webfont.woff b/vendor/assets/fonts/merriweather-bold-webfont.woff new file mode 100755 index 00000000000..a728400d5fd Binary files /dev/null and b/vendor/assets/fonts/merriweather-bold-webfont.woff differ diff --git a/vendor/assets/fonts/merriweather-bold-webfont.woff2 b/vendor/assets/fonts/merriweather-bold-webfont.woff2 new file mode 100755 index 00000000000..ff3bddfbd91 Binary files /dev/null and b/vendor/assets/fonts/merriweather-bold-webfont.woff2 differ diff --git a/vendor/assets/fonts/merriweather-italic-webfont.eot b/vendor/assets/fonts/merriweather-italic-webfont.eot new file mode 100755 index 00000000000..8841854416f Binary files /dev/null and b/vendor/assets/fonts/merriweather-italic-webfont.eot differ diff --git a/vendor/assets/fonts/merriweather-italic-webfont.ttf b/vendor/assets/fonts/merriweather-italic-webfont.ttf new file mode 100755 index 00000000000..3180e526d96 Binary files /dev/null and b/vendor/assets/fonts/merriweather-italic-webfont.ttf differ diff --git a/vendor/assets/fonts/merriweather-italic-webfont.woff b/vendor/assets/fonts/merriweather-italic-webfont.woff new file mode 100755 index 00000000000..d7071e3c233 Binary files /dev/null and b/vendor/assets/fonts/merriweather-italic-webfont.woff differ diff --git a/vendor/assets/fonts/merriweather-italic-webfont.woff2 b/vendor/assets/fonts/merriweather-italic-webfont.woff2 new file mode 100755 index 00000000000..f8660d06ff5 Binary files /dev/null and b/vendor/assets/fonts/merriweather-italic-webfont.woff2 differ diff --git a/vendor/assets/fonts/merriweather-light-webfont.eot b/vendor/assets/fonts/merriweather-light-webfont.eot new file mode 100755 index 00000000000..4115d282bbe Binary files /dev/null and b/vendor/assets/fonts/merriweather-light-webfont.eot differ diff --git a/vendor/assets/fonts/merriweather-light-webfont.ttf b/vendor/assets/fonts/merriweather-light-webfont.ttf new file mode 100755 index 00000000000..03cfa425339 Binary files /dev/null and b/vendor/assets/fonts/merriweather-light-webfont.ttf differ diff --git a/vendor/assets/fonts/merriweather-light-webfont.woff b/vendor/assets/fonts/merriweather-light-webfont.woff new file mode 100755 index 00000000000..9b3427536d9 Binary files /dev/null and b/vendor/assets/fonts/merriweather-light-webfont.woff differ diff --git a/vendor/assets/fonts/merriweather-light-webfont.woff2 b/vendor/assets/fonts/merriweather-light-webfont.woff2 new file mode 100755 index 00000000000..e53e4b531ec Binary files /dev/null and b/vendor/assets/fonts/merriweather-light-webfont.woff2 differ diff --git a/vendor/assets/fonts/merriweather-regular-webfont.eot b/vendor/assets/fonts/merriweather-regular-webfont.eot new file mode 100755 index 00000000000..c4cde6d0159 Binary files /dev/null and b/vendor/assets/fonts/merriweather-regular-webfont.eot differ diff --git a/vendor/assets/fonts/merriweather-regular-webfont.ttf b/vendor/assets/fonts/merriweather-regular-webfont.ttf new file mode 100755 index 00000000000..3889a606587 Binary files /dev/null and b/vendor/assets/fonts/merriweather-regular-webfont.ttf differ diff --git a/vendor/assets/fonts/merriweather-regular-webfont.woff b/vendor/assets/fonts/merriweather-regular-webfont.woff new file mode 100755 index 00000000000..1969d2ed0da Binary files /dev/null and b/vendor/assets/fonts/merriweather-regular-webfont.woff differ diff --git a/vendor/assets/fonts/merriweather-regular-webfont.woff2 b/vendor/assets/fonts/merriweather-regular-webfont.woff2 new file mode 100755 index 00000000000..3023ce73c87 Binary files /dev/null and b/vendor/assets/fonts/merriweather-regular-webfont.woff2 differ diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.eot b/vendor/assets/fonts/sourcesanspro-bold-webfont.eot new file mode 100644 index 00000000000..f031b206e42 Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-bold-webfont.eot differ diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.ttf b/vendor/assets/fonts/sourcesanspro-bold-webfont.ttf new file mode 100644 index 00000000000..02ae55e6e71 Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-bold-webfont.ttf differ diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.woff b/vendor/assets/fonts/sourcesanspro-bold-webfont.woff new file mode 100644 index 00000000000..1985bc0f19a Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-bold-webfont.woff differ diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-bold-webfont.woff2 new file mode 100644 index 00000000000..59cbda51993 Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-bold-webfont.woff2 differ diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.eot b/vendor/assets/fonts/sourcesanspro-italic-webfont.eot new file mode 100644 index 00000000000..e01ae4de040 Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-italic-webfont.eot differ diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.ttf b/vendor/assets/fonts/sourcesanspro-italic-webfont.ttf new file mode 100644 index 00000000000..b513caef9b0 Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-italic-webfont.ttf differ diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.woff b/vendor/assets/fonts/sourcesanspro-italic-webfont.woff new file mode 100644 index 00000000000..a512221ddaa Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-italic-webfont.woff differ diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-italic-webfont.woff2 new file mode 100644 index 00000000000..c1a6d9f1e8a Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-italic-webfont.woff2 differ diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.eot b/vendor/assets/fonts/sourcesanspro-light-webfont.eot new file mode 100644 index 00000000000..55d1c876c9b Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-light-webfont.eot differ diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.ttf b/vendor/assets/fonts/sourcesanspro-light-webfont.ttf new file mode 100644 index 00000000000..a4c674a00f9 Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-light-webfont.ttf differ diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.woff b/vendor/assets/fonts/sourcesanspro-light-webfont.woff new file mode 100644 index 00000000000..eb2fd5ae65c Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-light-webfont.woff differ diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-light-webfont.woff2 new file mode 100644 index 00000000000..091b8079af7 Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-light-webfont.woff2 differ diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.eot b/vendor/assets/fonts/sourcesanspro-regular-webfont.eot new file mode 100644 index 00000000000..cddebbca5f3 Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-regular-webfont.eot differ diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.ttf b/vendor/assets/fonts/sourcesanspro-regular-webfont.ttf new file mode 100644 index 00000000000..ac42fa1c241 Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-regular-webfont.ttf differ diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.woff b/vendor/assets/fonts/sourcesanspro-regular-webfont.woff new file mode 100644 index 00000000000..e057c48e84e Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-regular-webfont.woff differ diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-regular-webfont.woff2 new file mode 100644 index 00000000000..43ec601dc2c Binary files /dev/null and b/vendor/assets/fonts/sourcesanspro-regular-webfont.woff2 differ