-
-
-
+
+
+
-
diff --git a/app/scripts/app.js b/app/scripts/app.js
index 2557f5b..27cf3ee 100644
--- a/app/scripts/app.js
+++ b/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',
+ 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'
@@ -64,10 +64,10 @@ require.config({
});
-require(['jquery', 'polling_location_finder', 'bootstrapModal'], function($, findPollingLocationFor) {
+require(['jquery', 'polling_location_finder', 'bootstrapCollapse', 'bootstrapTab'], function($, findPollingLocationFor) {
//'use strict';
- $('.modal').modal('show');
+ // $('.modal').modal('show');
// //attach autocomplete
var $address = $('#address');
@@ -129,6 +129,7 @@ require(['jquery', 'polling_location_finder', 'bootstrapModal'], function($, fin
$btn.attr('disabled', false);
$btn.html(initialText);
$btn.removeClass('loading');
+ google.maps.event.trigger(map, 'resize');
});
}, geolocationErrorDisplay);
} else {
@@ -137,6 +138,8 @@ require(['jquery', 'polling_location_finder', 'bootstrapModal'], function($, fin
$btn.attr('disabled', false);
$btn.html(initialText);
$btn.removeClass('loading');
+ google.maps.event.trigger(map, 'resize');
+
}
});
@@ -180,7 +183,7 @@ require(['jquery', 'polling_location_finder', 'bootstrapModal'], function($, fin
zip_index = i;
}
}
-
+
var zipCodeComponent = addr_components[zip_index],
zipCode = zipCodeComponent && zipCodeComponent.short_name;
@@ -188,7 +191,7 @@ require(['jquery', 'polling_location_finder', 'bootstrapModal'], function($, fin
isStreetAddress = ($.inArray('street_address', address.types)) > -1;
return isInCambridge && isStreetAddress;
-
+
}
geocoder.geocode({
@@ -212,10 +215,13 @@ require(['jquery', 'polling_location_finder', 'bootstrapModal'], function($, fin
.html($('#noLocation').text());
} else {
displaySearchResults(results);
+ google.maps.event.trigger(map, 'resize');
}
});
} else {
displaySearchResults(results);
+ google.maps.event.trigger(map, 'resize');
+
}
});
}
diff --git a/app/scripts/polling_location_finder.js b/app/scripts/polling_location_finder.js
index 93cdd04..9a7fca4 100644
--- a/app/scripts/polling_location_finder.js
+++ b/app/scripts/polling_location_finder.js
@@ -18,16 +18,9 @@ define(['jquery', 'geojson', 'json!vendor/ELECTIONS_WardsPrecincts.geojson', 'js
// TODO move UI interaction into its own module
function showResults() {
- $('.modal').modal('hide');
+ $('.voting-result').show();
}
- function hideResults(e) {
- e.preventDefault();
- $('.modal').modal('show');
- }
-
- $('.back').on('click', hideResults);
-
// keep track of user precinct across calls so we can erase previous precincts if necessary
var userPrecinct;
diff --git a/app/styles/_colors.scss b/app/styles/_colors.scss
index 6ac10c0..360553d 100644
--- a/app/styles/_colors.scss
+++ b/app/styles/_colors.scss
@@ -12,3 +12,6 @@ $dark_blue: #0c5c92;
$med_blue: #246ada;
$light_blue: #509fd4;
$extra_light_blue: #b1d4eb;
+
+$cambridgeLightBlue: #eff7fc;
+$cambridgeBorder: darken($cambridgeLightBlue, 40%);
diff --git a/app/styles/_navbar.scss b/app/styles/_navbar.scss
new file mode 100644
index 0000000..4b0b359
--- /dev/null
+++ b/app/styles/_navbar.scss
@@ -0,0 +1,33 @@
+main {
+ background-color: $cambridgeLightBlue;
+}
+
+.navbar-cambridge {
+ border-radius: 0;
+ border: 0;
+ border-bottom: 3px solid $cambridgeBorder;
+ background-color: $cambridgeLightBlue;
+ margin-bottom: 0;
+
+ img {
+ height: $navbarLogoHeight;
+ }
+ .navbar-nav li a {
+ line-height: $navbarLogoHeight;
+ color: darken($cambridgeLightBlue, 60%);
+ }
+}
+
+.jumbotron-cambridge {
+ margin-bottom: 0;
+ padding: 3rem;
+ background: inherit;
+
+ h1 {
+ font-size: calc(1rem + 4vw);
+ }
+}
+
+.voting-result {
+ display: none;
+}
diff --git a/app/styles/_screens.scss b/app/styles/_screens.scss
index 69473db..2ab997f 100644
--- a/app/styles/_screens.scss
+++ b/app/styles/_screens.scss
@@ -17,20 +17,14 @@
100% { transform: translateX(100%); }
}
-html, body {
- min-width: 100%;
- min-height: 100%;
- overflow-x: hidden;
-}
-
.screen {
position: absolute;
- top: 0;
+ top: 0;
left: 0;
right: 0;
padding-top: 50px;
min-height: 100%;
-
+
&.left.inactive {
animation: currentToLeft 0.4s forwards;
}
@@ -57,5 +51,3 @@ html, body {
// left: 0;
// right: 0;
// }
-
-
diff --git a/app/styles/_spinner.scss b/app/styles/_spinner.scss
index dc60d7f..7bb6cde 100644
--- a/app/styles/_spinner.scss
+++ b/app/styles/_spinner.scss
@@ -1,6 +1,6 @@
.spinner {
- width: 1.5rem;
- height: 1.5rem;
+ width: 1em;
+ height: 1em;
position: relative;
margin: auto;
display: none;
diff --git a/app/styles/_tabs.scss b/app/styles/_tabs.scss
new file mode 100644
index 0000000..9a49ebc
--- /dev/null
+++ b/app/styles/_tabs.scss
@@ -0,0 +1,25 @@
+.cambridge-tabs {
+ padding-left: 3em;
+ border-color: $cambridgeBorder;
+
+ li a {
+ text-transform: uppercase;
+ font-weight: 600;
+ padding: .75em 1.5em;
+ border: 0;
+
+ &:hover {
+ background-color: darken($cambridgeLightBlue, 10%);
+ }
+ }
+
+ li.active a, li.active a:hover, li.active a:focus {
+ border: 1px solid $cambridgeBorder;
+ border-bottom-color: transparent;
+ }
+}
+
+.cambridge-tab-content {
+ background: $body-bg;
+ padding: 3em;
+}
diff --git a/app/styles/main.scss b/app/styles/main.scss
index 6754b10..67c5112 100644
--- a/app/styles/main.scss
+++ b/app/styles/main.scss
@@ -1,36 +1,35 @@
-@import 'colors';
-@import 'screens';
-@import 'spinner';
+//----THIRD PARTY CSS----//
-/* Import fontface definitions */
-@import 'icons';
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,600italic,700,800);
+@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,600italic,700,800|Rokkitt:400,700);
-$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/bootstrap-sass/assets/stylesheets/bootstrap';
+
+//----VOTE CAMBRIDGE CSS----//
-@import '../bower_components/sass-bootstrap/lib/bootstrap';
+$navbarLogoHeight: 28px;
-/*Variables*/
-$panelPadding: 10px;
-$panelRadius: 3px;
-$panelShadow: 0 2px 4px rgba(0,0,0, .3);
+@import 'colors'; // Custom color variables
+@import 'screens';
+@import 'spinner'; // CSS loading indicator
+@import 'icons'; // Import fontface definitions
+@import 'navbar'; // Navigation bar
+@import 'tabs'; // Tabs
+
+html {
+ font-size: 1.25em;
+}
+p.lead {
+ font-size: 1.2em;
+}
-/* Basic style overrides */
body {
color: $dark_gray;
font-family: 'Open Sans', sans-serif;
font-weight: 400;
- margin: 0; padding: 0;
- position:absolute;
- top:0;
- left:0;
- right:0;
- bottom:0;
- clip: rect(0, auto, auto, 0);
- background-image: url('../images/paper.png');
}
a {
@@ -40,100 +39,73 @@ a {
}
}
-
h1, h2, h3, h4 {
- font-family: 'Open Sans', sans-serif;
- font-weight: 600;
+ font-family: 'Rokkitt', 'Open Sans', sans-serif;
+ font-weight: 700;
margin: 0; padding: 0;
- line-height: 100%;
- color: white;
}
-.container {
- margin: 0;
- padding: 0;
- max-width: 100%;
-}
-.row {
- margin: 0;
- padding: 0;
+main > .row {
+ padding: 2rem 0;
+ background: complement($cambridgeLightBlue);
+
+ &:nth-of-type(2) {
+ background: $cambridgeLightBlue;
+ }
}
-.logo_small{
- position: absolute;
- top: 12px;
- left: 100px;
- height:2rem;
- }
#directions-link, #view_directions{
- display:inline-block;
- font-size: 11px;
+ // display:inline-block;
+ font-size: 1em;
}
#view_directions {
margin-right: 8px;
}
-/* Modal specific styles */
-.modal-dialog {
- z-index:1000;
-}
-
-.modal-body {
- text-align: center;
- .logo {
- width: 35%;
- max-width: 630px;
- margin-bottom: 3%;
- }
- h3 {
- margin: 2% 0;
- font-size: 24px;
- font-weight: 700;
- text-transform: uppercase;
- }
-}
/* Input styling */
-.input{
- padding: 15px 20px;
- background: rgba(0, 0, 0, 0.3);
- text-align: center;
+.voting-search > div:not(.divider) {
+ padding-top: 1em;
}
-label {
- font-size: 115%;
- font-weight: 600;
- text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.4);
+.control-label {
+ font-family: 'Rokkitt', 'Open Sans', sans-serif;
+ font-size: 1rem;
+ font-weight: 700;
+ display: inline-block;
}
-.btn {
- font-family: 'Open Sans', sans-serif;
- background-image: linear-gradient(lighten($light_blue, 10%), $light_blue);
+.btn-cambridge {
+ // font-family: 'Rokkitt','Open Sans', sans-serif;
+ background: $cambridgeLightBlue;
box-shadow: inset 0 1px 1px rgba(255, 255, 255, 0.5), inset 0 -1px 1px rgba(0, 0, 0, 0.1);
border-radius: 2px;
- border-color: rgba(0, 0, 0, 0.4);
- font-size: 100%;
- font-weight: 600;
+ border-color: darken($cambridgeLightBlue, 40%);
+ font-size: 1em;
+ font-weight: 700;
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.4);
+ color: darken($cambridgeLightBlue, 40%);
&:hover {
background: linear-gradient(lighten($light_blue, 7%), $light_blue);
+ text-shadow: none;
box-shadow: none;
border-color: rgba(0, 0, 0, 0.7);
+ color: white;
}
&:active {
background: $light_blue;
+ text-shadow: none;
box-shadow: none;
}
}
-a.btn { color: #333; }
-
.address {
input {
border-radius: 2px;
border-color: rgba(0, 0, 0, 0.4);
+ width: 100%;
&:focus {
box-shadow: none;
@@ -142,11 +114,6 @@ a.btn { color: #333; }
padding: 5px 11px;
}
}
- .btn {
- margin-top: 5px;
- width: 100%;
- }
-
}
#notice {
@@ -167,62 +134,28 @@ a.btn { color: #333; }
}
}
-.separator {
- margin: 2% 0 0;
- position: relative;
- font-size: 130%;
- font-weight: 300;
- text-transform: uppercase;
-
- &:before,
- &:after {
- content: '';
- position: absolute;
- top: 50%;
- width: 45%;
- height: 1px;
- background: rgba(0, 0, 0, 0.5);
- }
-
- &:before { left: 0; }
- &:after { right: 0; }
-}
-
-footer {
+.divider {
text-align: center;
-
- nav {
- font-size: 115%;
- font-weight: bold;
- margin-top: 5px;
- }
-
- .cfb {
- margin-top: 15px;
- border-top: 1px solid $light_gray;
- padding: 5px;
- color: $med_gray;
-
- .logo {
- display: block;
- margin: 12px auto 0;
- width: 45%;
- max-width: 325px;
- }
-
- li.divider:before {
- color: $gray_light;
- content: '\2022';
- }
+ padding-top: 1em;
+ padding-bottom: .5em;
+ line-height: 2;
+ font-size: 1em;
+ color: darken($cambridgeLightBlue, 40%);
+ width: 50%;
+
+ hr {
+ margin: 1em auto;
+ border-width: 3px;
+ border-color: darken($cambridgeLightBlue, 40%);
+ width: 40%;
}
+}
+.form-inline > * {
+ margin-right: .5em;
}
.location {
- .current-location {
- margin: 2% 0;
- width: 100%;
- }
.current-location.loading {
.icon-location {
display: none;
@@ -232,108 +165,39 @@ footer {
top: 3px; // to align with text
}
}
- .clarification {
- font-size: 13px;
- }
}
.result nav {
- position: fixed;
-}
-
-#map {
- position: fixed !important;
- top:50px;
- left: 0;
- right: 0;
- bottom: 0;
- border-top: 3px solid rgba(0, 0, 0, 0.4);
+ // position: fixed;
}
.location-data {
- position: static;
+ // position: static;
}
-// #streetview {
-// position: absolute;
-// top:50px;
-// left: 0;
-// right: 0;
-// bottom: 0;
-// transform: translateY(65%);
-// border-top: 3px solid rgba(0, 0, 0, 0.4);
-
-// img {
-// width: 100%;
-// height: 100%;
-// }
-// }
-
-#info {
- position: absolute;
- top: 50px;
- left: 0;
- right: 0;
- bottom: 0;
- transform: translateY(66%);
- background: white;
- color: $dark_gray;
- transition: transform .3s ease;
-
- header {
- position: relative;
- background: $light_gray;
- min-height: 20%;
- padding: 10px 30px 5px;
- color: $dark_gray;
- text-align: center;
- border-top: 3px solid rgba(0, 0, 0, 0.4);
- cursor: pointer;
- }
+#streetview {
+ // position: absolute;
+ // top:50px;
+ // left: 0;
+ // right: 0;
+ // bottom: 0;
+ // transform: translateY(65%);
+ // border-top: 3px solid rgba(0, 0, 0, 0.4);
- h4 {
- color: white;
- font-size: 150%;
- font-weight: 300;
- text-transform: uppercase;
- margin-bottom: 5px;
- text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.25);
- height: 60%;
- }
-
- .notes {
- font-size: 115%;
- height: 40%;
- }
-
- &.up {
- transform: translateY(0);
- transition: transform .3s ease;
+ img {
+ width: 100%;
+ height: 100%;
}
}
-#directions-link {
- /* position: absolute;
- right: 0; bottom: 0;
- background: $extra_light_gray;
- font-size: 30px;
- line-height: 30px;
- padding: 3px 6px 0;
- margin: 0;
- border-radius: 2px 0 0;
-
- a {
- color: $dark_gray;
-
- &:hover {
- text-decoration: none;
- }
- }*/
+#info header {
+ background: $cambridgeLightBlue;
+ padding: 2em;
}
+#map { min-height: 100vh; }
+
#directions {
- width: 100%;
- background: white;
padding-left: 5px;
padding-right: 5px;
padding-bottom: 30px;
@@ -342,88 +206,49 @@ footer {
cursor: pointer;
}
-
- * {
- font-family: 'Open Sans', sans-serif;
- }
-
.adp-directions {
- width: 100%;
+ // width: 100%;
}
}
-.back.btn {
- position: absolute;
- top: 8px;
- left: 15px;
- padding: 3px 12px;
-}
-
-
@media (min-width: $screen-sm) {
- #map {
- display:fixed;
- top: 50px;
- left: 10px;
- bottom: 10px;
- /*width: 70%;*/
- /*padding: $panelPadding;*/
- box-shadow: $panelShadow;
- border-radius: $panelRadius;
- border-top: none;
- }
+ #streetview { display: none; }
+ #view_directions{ display: none; }
+}
- .location-data {
- position: fixed;
- width:32%;
- top: 50px;
- right: 10px;
- bottom: 10px;
+@media (max-width: $screen-xs) {
+ html { font-size: 1.125em; }
+ .btn-cambridge {
+ font-size: 1.2em;
+ width: 100%;
+ }
+}
+// MOBILE
+@media (max-width: $screen-xs) {
+ .cambridge-tabs {
+ padding-left: 1em;
+ li a {
+ padding: .5em 1em;
+ h2 { font-size: 1em; }
}
+ }
- #info {
- /*padding: $panelPadding;*/
- position:absolute;
- top: 0;
- left: auto;
- right:0;
- width: 94%;
- box-shadow: $panelShadow;
- border-radius: $panelRadius;
- transform: none;
-
- header {
- background: $light_gray;
- min-height: 15%;
- padding: 2% 5%;
- color: $dark_gray;
- text-align: center;
- border-top-right-radius: $panelRadius;
- border-top-left-radius: $panelRadius;
- border-top: none;
- }
- }
- #info #directions{
- width:auto;
- overflow-y:scroll;
- height:80%;
- border-bottom-right-radius: $panelRadius;
- border-bottom-left-radius: $panelRadius;
- padding:5px;
- }
- #streetview {
- display: none;
- }
- #view_directions{
- display: none;
- }
- .logo_small{
- position: absolute;
- top: 8px;
- left: 115px;
- height:32px;
+ .cambridge-tab-content {
+ padding: 1em;
+ .tab-pane {
+ padding: 0;
+ font-size: .8em;
}
+ }
+}
+
+@media (max-width: $screen-sm) {
+ .jumbotron-cambridge {
+ padding: 1em;
+ small { display: block; }
+ p { font-size: 1em;}
+ }
}
.pac-container {
diff --git a/bower.json b/bower.json
index 13f1764..88bf94f 100644
--- a/bower.json
+++ b/bower.json
@@ -1,13 +1,13 @@
{
"name": "cambridge-voting-locations",
- "version": "0.0.0",
+ "version": "1.0.0",
"dependencies": {
- "sass-bootstrap": "~3.0.0",
"requirejs": "~2.1.8",
- "jquery": "~1.10.2",
+ "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": {}
}
diff --git a/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot b/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot
new file mode 100644
index 0000000..b93a495
Binary files /dev/null and b/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot differ
diff --git a/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.svg b/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.svg
new file mode 100644
index 0000000..94fb549
--- /dev/null
+++ b/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.svg
@@ -0,0 +1,288 @@
+
+
+
\ No newline at end of file
diff --git a/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf b/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf
new file mode 100644
index 0000000..1413fc6
Binary files /dev/null and b/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf differ
diff --git a/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff b/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff
new file mode 100644
index 0000000..9e61285
Binary files /dev/null and b/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff differ
diff --git a/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 b/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2
new file mode 100644
index 0000000..64539b5
Binary files /dev/null and b/dist/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 differ
diff --git a/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.eot b/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index 423bd5d..0000000
Binary files a/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.eot and /dev/null differ
diff --git a/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.svg b/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.svg
deleted file mode 100644
index 4469488..0000000
--- a/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.ttf b/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.ttf
deleted file mode 100644
index a498ef4..0000000
Binary files a/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.ttf and /dev/null differ
diff --git a/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.woff b/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.woff
deleted file mode 100644
index d83c539..0000000
Binary files a/dist/bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/dist/index.html b/dist/index.html
index f7d7ba7..c097e35 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -10,90 +10,53 @@
-
+
-
-
-
-
-
- 
-
-
+
+
+
+
+
-
-
-
