use OFFICIAL bootstrap sass instead of whatever this buggy one was. U…

…pdates bootstrap from 3.0.0 to 3.3.7.

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/*.*'
                     ]
                 }]

app/index.html

@@ -97,7 +97,6 @@ <h4 class="location"></h4>
 
         <!-- build:js scripts/vendor.js -->
         <!-- bower:js -->
-        <script src="bower_components/jquery/jquery.js"></script>
         <script src="scripts/vendor/maps.google.polygon.containsLatLng.js"></script>
         <!-- endbower -->
         <!-- endbuild -->

app/scripts/app.js

@@ -1,18 +1,18 @@
 require.config({
     paths: {
-        jquery: '../bower_components/jquery/jquery',
-        bootstrapAffix: '../bower_components/sass-bootstrap/js/affix',
-        bootstrapAlert: '../bower_components/sass-bootstrap/js/alert',
-        bootstrapButton: '../bower_components/sass-bootstrap/js/button',
-        bootstrapCarousel: '../bower_components/sass-bootstrap/js/carousel',
-        bootstrapCollapse: '../bower_components/sass-bootstrap/js/collapse',
-        bootstrapDropdown: '../bower_components/sass-bootstrap/js/dropdown',
-        bootstrapModal: '../bower_components/sass-bootstrap/js/modal',
-        bootstrapPopover: '../bower_components/sass-bootstrap/js/popover',
-        bootstrapScrollspy: '../bower_components/sass-bootstrap/js/scrollspy',
-        bootstrapTab: '../bower_components/sass-bootstrap/js/tab',
-        bootstrapTooltip: '../bower_components/sass-bootstrap/js/tooltip',
-        bootstrapTransition: '../bower_components/sass-bootstrap/js/transition',
+        jquery: '../bower_components/jquery/dist/jquery',
+        bootstrapAffix: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/affix',
+        bootstrapAlert: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/alert',
+        bootstrapButton: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/button',
+        bootstrapCarousel: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/carousel',
+        bootstrapCollapse: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/collapse',
+        bootstrapDropdown: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/dropdown',
+        bootstrapModal: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/modal',
+        bootstrapPopover: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/popover',
+        bootstrapScrollspy: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/scrollspy',
+        bootstrapTab: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/tab',
+        bootstrapTooltip: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/tooltip',
+        bootstrapTransition: '../bower_components/bootstrap-sass/assets/javascripts/bootstrap/transition',
         text: '../bower_components/requirejs-text/text',
         geojson: '../bower_components/geojson-google-maps/GeoJSON',
         json: 'vendor/json'

app/styles/main.scss

@@ -6,12 +6,12 @@
 @import 'icons';
 @import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,600italic,700,800);
 
-$icon-font-path: "/bower_components/sass-bootstrap/fonts/";
+$icon-font-path: "/bower_components/bootstrap-sass/assets/fonts/bootstrap";
 $fa-font-path:   "/bower_components/font-awesome/fonts";
 
 @import '../bower_components/font-awesome/scss/font-awesome';
 
-@import '../bower_components/sass-bootstrap/lib/bootstrap';
+@import '../bower_components/bootstrap-sass/assets/stylesheets/bootstrap';
 
 /*Variables*/
 $panelPadding: 10px;

bower.json

@@ -2,12 +2,12 @@
   "name": "cambridge-voting-locations",
   "version": "0.0.0",
   "dependencies": {
-    "sass-bootstrap": "~3.0.0",
     "requirejs": "~2.1.8",
     "jquery": "~1.10.2",
     "requirejs-text": "~2.0.10",
     "geojson-google-maps": "*",
-    "font-awesome": "~4.0.2"
+    "font-awesome": "~4.0.2",
+    "bootstrap-sass": "~3.3.7"
   },
   "devDependencies": {}
 }