From dc27e50d205c641012a9dd95e5d9639df97379cd Mon Sep 17 00:00:00 2001 From: cristen jones Date: Thu, 13 Oct 2016 00:02:04 -0400 Subject: [PATCH] Redesign to support tabbed early voting view (#50) * use OFFICIAL bootstrap sass instead of whatever this buggy one was. Updates bootstrap from 3.0.0 to 3.3.7. * initial redesigned site, no early info added yet. WIP for codeforboston/cambridge_voting_locations#35 * fix jquery, map resize fix for tabs * pin down jquery version (the updated bootstrap will upgrade it otherwise) * make it usable on mobile * adjust spinner position and make it not bigger than the button text --- Gruntfile.js | 2 +- app/index.html | 175 +++++--- app/scripts/app.js | 38 +- app/scripts/polling_location_finder.js | 9 +- app/styles/_colors.scss | 3 + app/styles/_navbar.scss | 33 ++ app/styles/_screens.scss | 12 +- app/styles/_spinner.scss | 4 +- app/styles/_tabs.scss | 25 ++ app/styles/main.scss | 407 +++++------------- bower.json | 8 +- .../glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../glyphicons-halflings-regular.svg | 288 +++++++++++++ .../glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes .../fonts/glyphicons-halflings-regular.eot | Bin 20290 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 229 ---------- .../fonts/glyphicons-halflings-regular.ttf | Bin 41236 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23292 -> 0 bytes dist/index.html | 109 ++--- dist/scripts/4e6b40f3.app.js | 8 - dist/scripts/92d329e6.vendor.js | 3 - dist/scripts/bfd3abd1.app.js | 8 + dist/scripts/dd678c2e.vendor.js | 1 + dist/styles/b1101342.main.css | 4 - dist/styles/b333c306.main.css | 8 + 27 files changed, 657 insertions(+), 717 deletions(-) create mode 100644 app/styles/_navbar.scss create mode 100644 app/styles/_tabs.scss create mode 100644 dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot create mode 100644 dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.svg create mode 100644 dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf create mode 100644 dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff create mode 100644 dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 delete mode 100644 dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.eot delete mode 100644 dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.svg delete mode 100644 dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.ttf delete mode 100644 dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.woff delete mode 100644 dist/scripts/4e6b40f3.app.js delete mode 100644 dist/scripts/92d329e6.vendor.js create mode 100644 dist/scripts/bfd3abd1.app.js create mode 100644 dist/scripts/dd678c2e.vendor.js delete mode 100644 dist/styles/b1101342.main.css create mode 100644 dist/styles/b333c306.main.css diff --git a/Gruntfile.js b/Gruntfile.js index 7c39cf8..f01d148 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -227,7 +227,7 @@ module.exports = function (grunt) { '.htaccess', 'images/*', 'styles/fonts/{,*/}*.*', - 'bower_components/sass-bootstrap/fonts/*.*', + 'bower_components/bootstrap-sass/assets/fonts/bootstrap/*.*', 'bower_components/font-awesome/fonts/*.*' ] }] diff --git a/app/index.html b/app/index.html index f5cb2cd..38918d4 100644 --- a/app/index.html +++ b/app/index.html @@ -18,86 +18,125 @@ -