Skip to content

Commit

Permalink
Redesign to support tabbed early voting view (#50)
Browse files Browse the repository at this point in the history 
* 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 #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
  • Loading branch information
@thecristen @carpeliam
thecristen authored and carpeliam committed Oct 13, 2016
1 parent 748b164 commit 2971891
Show file tree
Hide file tree
Showing 16 changed files with 341 additions and 317 deletions.
Binary file added bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot
View file
Binary file not shown.
288 changes: 288 additions & 0 deletions ...mponents/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.svg
View file
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 bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf
View file
Binary file not shown.
Binary file added bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff
View file
Binary file not shown.
Binary file added bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2
View file
Binary file not shown.
Binary file removed bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.eot
View file
Binary file not shown.
229 changes: 0 additions & 229 deletions bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.svg
View file

This file was deleted.

Binary file removed bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.ttf
View file
Binary file not shown.
Binary file removed bower_components/sass-bootstrap/fonts/glyphicons-halflings-regular.woff
View file
Binary file not shown.
109 changes: 36 additions & 73 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,90 +10,53 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
<link rel="stylesheet" href="styles/b1101342.main.css">
<link rel="stylesheet" href="styles/b333c306.main.css">
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB7fHkcx_rJi_YTbk3Gu7ig_H3GvyzPT2Y&libraries=places"></script>
<!-- update this line if we update this image -->
<meta property="og:image" content="http://votecambridge.com/images/45b5ba8f.for_social_media.png">
</head>
<body>
<div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="modalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<header>
<h1><img src="images/b763798b.logo.png" class="logo" alt="Vote Cambridge"></h1>
</header>
<div class="input">
<h3 id="modalLabel">Find your polling place</h3>
<div id="notice"></div>
<div class="address">
<form class="clearfix">
<label for="address"><span class="icon-home"></span> Enter home address</label>
<input type="text" id="address" class="input-md form-control" placeholder="1234 Main St">
<button class="btn btn-default" type="submit"><span class="icon-search"></span> Find</button>
</form>
</div>
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" href="#">
<img alt="" src="images/3a1694e3.logo_small.png">
</a>

<div class="separator">
Or
</div>
</div>
<p class="navbar-text">Find your voting location & times.</p>

<div class="location">
<a class="btn btn-default current-location">
<span class="icon-location"></span>
<span class="button-text">Use current location</span>
<span class="spinner">
<span class="double-bounce1"></span>
<span class="double-bounce2"></span>
</span>
</a>
<span class="clarification">Use current location only if you are at your place of residence.</span>
</div>
</div>
<footer>
<nav>
<a href="http://www.cambridgema.gov/election"><span class="icon-info-sign"></span> Election information</a>
</nav>
<div class="cfb">
<p>
Built as a public technology service by
<a href="http://www.meetup.com/Code-for-Boston">
<img src="images/5f5f4bde.cfb_logo.png" alt="" class="logo">
</a>
</p>
<ul class="list-inline">
<li><a href="https://twitter.com/CodeForBoston" target="_blank"><span class="fa fa-twitter"></span>@CodeForBoston</a></li>
<li class="divider"></li>
<li><a href="http://www.github.com/codeforboston/cambridge_voting_locations" target="_blank"><span class="fa fa-github"></span>
Source</a></li>
</ul>
</div>
</footer>
</div>
<ul class="nav navbar-nav navbar-right">
<li><a href="#">About</a></li>
</ul>
</div>
</nav>
<main class="container-fluid">
<div class="voting-info row">
<div class="col-sm-12">
<p>Voting Info goes here</p>
</div>
</div>
</div>

<div class="result row">
<nav>
<a href="#" class="back btn btn-default"><span class="icon-circle-arrow-left"></span> Back</a>
<img src="images/3a1694e3.logo_small.png" class="logo_small" alt="Vote Cambridge">
</nav>
<div id="map" class="col-sm-8"></div>
<div class="location-data col-sm-4">
<div id="info">
<header>
<h4 class="location"></h4>
<p class="notes"></p>
<a id="view_directions" class="btn"><span class="icon-info-sign"></span> View directions</a>
<a id="directions-link" class="btn" target="_blank" title="Open navigation"><span class="icon-compass"></span> View in Map app</a>
</header>
<div id="directions"></div>
<div class="voting-result row">
<div id="map" class="col-sm-8"></div>
<div class="location-data col-sm-4">
<nav>
<a href="#" class="back btn btn-default"><span class="icon-circle-arrow-left"></span> Back</a>
</nav>
<div id="info">
<header>
<h4 class="location"></h4>
<p class="notes"></p>
<a id="view_directions" class="btn"><span class="icon-info-sign"></span> View directions</a>
<a id="directions-link" class="btn" target="_blank" title="Open navigation"><span class="icon-compass"></span> View in Map app</a>
</header>
<div id="directions"></div>
</div>
</div>
</div>
</div>
</main>

<script src="scripts/92d329e6.vendor.js"></script>
<script src="scripts/dd678c2e.vendor.js"></script>

<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
<script>
Expand All @@ -105,7 +68,7 @@ <h4 class="location"></h4>
ga('create','UA-37610225-3');ga('send','pageview');
</script>

<script data-main="scripts/4e6b40f3.app" src="bower_components/requirejs/require.js"></script>
<script data-main="scripts/bfd3abd1.app" src="bower_components/requirejs/require.js"></script>

<script id="noLocation" type="text/template">
<h4>
Expand Down
8 changes: 0 additions & 8 deletions scripts/4e6b40f3.app.js
View file

This file was deleted.

3 changes: 0 additions & 3 deletions scripts/92d329e6.vendor.js
View file

This file was deleted.

8 changes: 8 additions & 0 deletions scripts/bfd3abd1.app.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions scripts/dd678c2e.vendor.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions styles/b1101342.main.css
View file

This file was deleted.

8 changes: 8 additions & 0 deletions styles/b333c306.main.css
View file

Large diffs are not rendered by default.

0 comments on commit 2971891

Please sign in to comment.