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

Integrating Leaflet-Environmental-Library . #269

Merged
merged 5 commits into from
Jul 12, 2018

Conversation

sagarpreet-chadha
Copy link
Contributor

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

#268

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

  • tests pass -- rake test
  • code has been rebased on top of latest master (check if another pull request was added recently, and please rebase)
  • pull request is descriptively named and, if possible, multiple commits squashed if they're smaller changes

Thanks!

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

How does this look ?

screen shot 2018-07-07 at 1 08 44 pm

@sagarpreet-chadha
Copy link
Contributor Author

@jywarren ...in the map there are 2 grey lines (see pic above) . What could be the possible reason ?

@sagarpreet-chadha
Copy link
Contributor Author

Hi @jywarren ...can you confirm this by running on localhost ?Thanks !

@sagarpreet-chadha
Copy link
Contributor Author

The grey lines appear even if i remove the leaflet-environmental-layers completely .

@sagarpreet-chadha
Copy link
Contributor Author

Okay Finally found --- its because of Bootstrap's CSS that adds those grey spaces in leaflet map .

@sagarpreet-chadha
Copy link
Contributor Author

sagarpreet-chadha commented Jul 8, 2018

Hi ...there seems to be no way of disabling the inheritance of CSS property .
One solution is to use CSS grid instead of Bootstrap .
What should we do ?

If used outside Bootstrap grid :
screen shot 2018-07-08 at 2 45 45 pm
How does this look ?

@jywarren
Copy link
Member

jywarren commented Jul 9, 2018

Oh, that's unfortunate. Can you link to anyone else having this issue, or docs? I feel we should be able to override the CSS... do you know what rule in particular is causing it?

@sagarpreet-chadha
Copy link
Contributor Author

This is the same issue :
https://gis.stackexchange.com/questions/112100/bootstrap-and-leaflet-grid-issue

And this is related issue :
Leaflet/Leaflet#3862

I am not able to find which CSS in bootstrap is causing this .

@jywarren
Copy link
Member

Hi @sagarpreet-chadha sorry i couldn't work on this earlier, but i like your solution of just putting it full-width above the grid. Let's do that!

@sagarpreet-chadha
Copy link
Contributor Author

Done @jywarren ...kindly review this 👍 .

@jywarren
Copy link
Member

Could you screenshot? Thank you!!!

@sagarpreet-chadha
Copy link
Contributor Author

Screenshot :

screen shot 2018-07-08 at 2 45 45 pm

@sagarpreet-chadha
Copy link
Contributor Author

And reminder : to run bower install 😄 .

@jywarren
Copy link
Member

jywarren commented Jul 12, 2018 via email

@sagarpreet-chadha
Copy link
Contributor Author

HI !
Yes the change in marker will be in the library itself ...we can do that 👍 and then you can do a version bump ?

@sagarpreet-chadha
Copy link
Contributor Author

screen shot 2018-07-12 at 11 43 24 pm

How does this look ?
If it is good to go we can merge this after we finalize the marker icon here in this PR publiclab/leaflet-environmental-layers#31 .

@@ -29,7 +29,8 @@
"glfx-js": "git+https://github.com/jywarren/glfx.js.git",
"webgl-distort": "jywarren/webgl-distort",
"image-sequencer": "git+https://github.com/publiclab/image-sequencer.git#~1.4.0",
"junction": "theleagueof/junction"
"junction": "theleagueof/junction",
"leaflet-environmental-layers": "*"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will take latest version always , right ?
Can you confirm this @jywarren ?

@jywarren
Copy link
Member

jywarren commented Jul 12, 2018 via email

@jywarren
Copy link
Member

Yeah this looks awesome. Great work!

@jywarren
Copy link
Member

I think we can merge this and then just not yet deploy to MK until we're ready in the upstream library. Going ahead! Thanks!!!

@jywarren jywarren merged commit cd1715c into publiclab:master Jul 12, 2018
@ghost ghost removed the in progress label Jul 12, 2018
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