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

Integrated leaflet-environmental-layers library to /maps . #3166

Merged
merged 1 commit into from Aug 1, 2018

Conversation

sagarpreet-chadha
Copy link
Contributor

@sagarpreet-chadha sagarpreet-chadha commented Jul 30, 2018

Fixes #3165 😄 🗺 🌍 !

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • PR body includes fixes #0000-style reference to original issue #
  • ask @publiclab/reviewers for help, in a comment below

Thanks!

@ghost ghost added the in progress label Jul 30, 2018
@sagarpreet-chadha
Copy link
Contributor Author

Screenshot :

screen shot 2018-07-30 at 1 33 25 pm

@sagarpreet-chadha
Copy link
Contributor Author

Hi @jywarren !
How does this look ?

PS : Kindly first merge #3101 before merging this 😄 ! Thanks !

@jywarren
Copy link
Member

Hi, does this by default display the maps already at /maps, in blue? then the mapknitter ones in red? Thanks!

@jywarren
Copy link
Member

Could we have MapKnitter icons be half-sized, and the blue default ones be full-sized?

Thanks, this is awesome!

@sagarpreet-chadha
Copy link
Contributor Author

Yes --- blue markers are display default map markers AND red markers are for Mapknitter . Thanks !

@jywarren
Copy link
Member

Great! Then pending this octokit test bug, we are ready to merge here? Can u mark as "ready"? I hope to fix that today or tomorrow.

@plotsbot
Copy link
Collaborator

plotsbot commented Aug 1, 2018

1 Message
📖 @sagarpreet-chadha Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.

Generated by 🚫 Danger

@ghost ghost removed the ready label Aug 1, 2018
@ghost ghost added the in progress label Aug 1, 2018
@sagarpreet-chadha
Copy link
Contributor Author

The tests have passed . Kindly review this 😄 !

@jywarren jywarren merged commit acc5c39 into master Aug 1, 2018
@ghost ghost removed the in progress label Aug 1, 2018
@jywarren
Copy link
Member

jywarren commented Aug 1, 2018

🎉

@jywarren
Copy link
Member

jywarren commented Aug 1, 2018

Hmm, i just published this but it doesn't seem that it's appearing... not sure why!

https://publiclab.org/maps

@jywarren
Copy link
Member

jywarren commented Aug 1, 2018

Maybe we have to trigger the bower update via #3173 - let me check that this is also published!

@jywarren
Copy link
Member

jywarren commented Aug 1, 2018

Oh wait, i didn't get all the commits! Hang on!

@jywarren
Copy link
Member

jywarren commented Aug 1, 2018

OK, should be working now -- def working in stable.publiclab.org/maps now! Sorry false alarm!!!

stefannibrasil pushed a commit to milaaraujo/plots2 that referenced this pull request Aug 3, 2018
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
@emilyashley emilyashley deleted the feature-integration-maps-page branch January 15, 2020 21:51
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.

[Continued] Integrating Leaflet-environmental-library to /maps .
3 participants