Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated design #50

Merged
merged 7 commits into from
Oct 13, 2016
Merged

updated design #50

merged 7 commits into from
Oct 13, 2016

Conversation

thecristen
Copy link
Member

@thecristen thecristen commented Oct 13, 2016

Heyo, here's the code from the redesign I showed around last night.
@thadk contributed a fix yesterday for the map rendering issue we saw - it turns out google maps doesn't get along with hidden elements too well but that part should be good now.

Boring but pertinent things about this code change

  • The bootstrap that was in this app was buggy and bootleg. I've replaced it with the official bootstrap-sass, and in doing so upgraded bootstrap from 3.0.0 to 3.3.7
  • This updated bootstrap will try to bring in jquery 3.0 instead of the currently used 1.10.2. these two versions of jquery have different directory structures, which means we'd have to adjust pathnames in a file... which is unnecessary. I don't want bower install to mess with people's setups (like it did mine). So I pinned the version of jquery to the version specified in our .bower.json

Screenshots!

image
image

@thecristen
Copy link
Member Author

I just added a commit to make it usable on mobile, so here's how that looks at the moment:

image

image

@carpeliam
Copy link
Member

Great fix! One comment- with my browser maximized, the map is below the fold on the Election Day tab (similar to your first screenshot), so I have to know to scroll down in order to see the map. We might want to adjust this, but definitely not a blocker for merge.

@carpeliam carpeliam merged commit dc27e50 into codeforboston:master Oct 13, 2016
@carpeliam
Copy link
Member

fixes #35

@carpeliam carpeliam mentioned this pull request Oct 14, 2016
carpeliam pushed a commit that referenced this pull request Oct 27, 2016
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants