Merge a lot of PRs from the old repository #8
Conversation
Following my issue #59.
Cloudmade tile not working. Replaced by OpenStreetMap
|
Thanks @george-silva! |
bower.json
Outdated
| "authors": [ | ||
| "Lennard Voogdt <[email protected]>" | ||
| "Lennard Voogdt <[email protected]>", | ||
| "George Silva <[email protected]", |
There was a problem hiding this comment.
Missing > at the end of email address
examples/basic-example.html
Outdated
| <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.ie.css" /> | ||
| <![endif]--> | ||
| <link href="https://unpkg.com/[email protected]/css/font-awesome.css" rel="stylesheet"/> | ||
| <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" /> |
examples/basic-example.html
Outdated
| </head> | ||
| <body> | ||
| <div id="map" style="width: 800px; height: 600px"></div> | ||
|
|
||
| <script src="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.js"></script> | ||
| <script src="https://unpkg.com/leaflet@0.7.7/dist/leaflet.js"></script> |
There was a problem hiding this comment.
Leaflet 1.0.3 is out, you should try to use that here in and in other examples
README.md
Outdated
| - Font Awesome 3.0 | ||
| - Leaflet 0.5 | ||
|
|
||
| Use version 2.0 for newer versions of bootstrap and font-awesome! |
There was a problem hiding this comment.
Use version 2.0.x for compatibility with newer versions of bootstrap, font-awesome and leaflet.
It is tested and works with the latest available versions:
- Bootstrap 3.3.7
- Font Awesome 4.7.0
- Leaflet 1.0.3
|
@george-silva Any progress on this one? |
|
Hello @theashyster . I haven't been able to correct the pointers you gave us. Will do today. |
|
@theashyster I've added you to the contributors. What is your email, so I can add it up? |
|
Hello @george-silva |
README.md
Outdated
| - Leaflet > 0.7 | ||
|
|
||
| Use version 2.0 for newer versions of bootstrap and font-awesome! | ||
|
|
There was a problem hiding this comment.
I have revisited this now, did not see that there is already something written about version 2.0, my bad.
I would suggest that this part is written a bit better all together, like this.
Version 2.0 of Leaflet.awesome-markers is tested and works with the latest available versions:
- Bootstrap 3 (up to 3.3.7)
- Font Awesome 4.0 (up to 4.7.0)
- Ionicons 1.5.2
- Leaflet 0.5 (up to 1.0.3)
Use version 2.0.x for compatibility with the newer versions of bootstrap, font-awesome and leaflet.
Version 1.0 of Leaflet.awesome-markers is tested and works with:
- Bootstrap 2
- Font Awesome 3.0
- Leaflet 0.5
Use version 1.0.x for compatibility with the older versions of bootstrap, font-awesome and leaflet.
|
@george-silva Also all examples should use Leaflet 1.0.3 both CSS and JS files, I saw you made some changes for the CSS files, but there are still some left and you did not change the JS files to use the 1.0.3 version. |
|
I saw that now. Updating. |
|
@theashyster please, check 😄 |
examples/with-bootstrap.html
Outdated
| <script src="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.js"></script> | ||
| <link href="https://unpkg.com/[email protected]/css/font-awesome.css" rel="stylesheet"/> | ||
| <link href="https://unpkg.com/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"> | ||
| <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" /> |
There was a problem hiding this comment.
Still 0.7.7, use 1.0.3
There was a problem hiding this comment.
darn, missed this one.
|
@theashyster I'll leave this another day or two so we can test this out. If all goes well we'll merge it to dev. There is bug #9 to solve before cutting a new release. |
|
@george-silva Okay, cool. Yeah, I agree. |
|
@george-silva Any plans on merging this and also fixing #11? |
|
I'll see if we can this done today.
Thanks for the reminder.
…On Fri, Apr 28, 2017 at 4:52 AM, Andris Nolendorfs ***@***.*** > wrote:
@george-silva <https://github.com/george-silva> Any plans on merging this
and also fixing #11
<#11>?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#8 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AA0rP2fp1T9CBFzgnkuKyUq0uqopUjJ8ks5r0ZrBgaJpZM4Lv9OI>
.
--
George R. C. Silva
Sigma Geosistemas LTDA
----------------------------
http://www.sigmageosistemas.com.br/
|
|
I'll give this a run tomorrow. If no issues appear, I'll merge. The other bug might take longer. |
|
@george-silva Great to hear that. Yes, merge it. The other bug can be worked on separately. |
|
@george-silva As this is still open, maybe you should update and test with the newest version of |
|
@george-silva what is the status of this? |
Hello all!
@bhaskarvk merged a lot of Pull Requests from different maintainers into the old repository.
Please, if anyone can help review/test to see if there are any incompatibilities, let me know.
I'll leave this open for a few days, to give everyone the chance to test it out.