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

grid added to location form, closes #1170 #1171

Merged
merged 5 commits into from
Jan 10, 2017

Conversation

mridulnagpal
Copy link
Member

@mridulnagpal mridulnagpal commented Jan 5, 2017

Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!

  • all tests pass -- rake test:all
  • code is in uniquely-named feature branch, and has been rebased on top of latest master (especially if you've been asked to make additional changes)
  • pull request is descriptively named with #number reference back to original issue
  • if possible, multiple commits squashed if they're smaller changes
  • reviewed/confirmed/tested by another contributor or maintainer
  • schema.rb.example has been updated if any database migrations were added

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/wiki/contributing-to-public-lab-software

We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays. Please alert developers on plots-dev@googlegroups.com when your request is ready or if you need assistance.

Thanks!

@mridulnagpal
Copy link
Member Author

@jywarren jywarren mentioned this pull request Jan 5, 2017
6 tasks
@jywarren
Copy link
Member

jywarren commented Jan 5, 2017

Oh cool! Is it possible to make the squares transparent?

Also, although it now reads better in mobile, I think it's quite a bit too big in desktop view. Perhaps vw isn't quite what we need?

@mridulnagpal
Copy link
Member Author

image
I have now used font-size: %

@mridulnagpal
Copy link
Member Author

The squares are now transparent as well
image

@jywarren jywarren changed the title grid added #1170 grid added to location form, closes #1170 Jan 6, 2017
@jywarren
Copy link
Member

jywarren commented Jan 6, 2017

Looks great, thanks -- do you think you could move the grid code into a JavaScript file, rather than it being inline? You could:

  • wrap it in a function addGrid(map) { ... } method
  • move the code itself to /app/assets/javascripts/locationForm.js
  • include it via: <%= javascript_include_tag "locationForm" %>
  • inline, just call that function with addGrid(map);

Does that makes sense? I'd have made a new issue for these steps, but I think it's fairly straightforward.

Thank you!

@mridulnagpal
Copy link
Member Author

@jywarren Made the changes

@jywarren
Copy link
Member

This looks awesome, thank you! Merging.

@jywarren jywarren merged commit 7bee86e into publiclab:master Jan 10, 2017
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.

2 participants