Skip to content

Style tags need to be in the template tag and property cleanup for 2.0 #87

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Style tags need to be in the template tag and property cleanup for 2.0 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d755ca9
Style tags need to be in the template tag and property cleanup for 2.0
maartenst Mar 19, 2017
f6c501a
update to polymer 2
maartenst Jun 3, 2017
1978b57
update leaflet version
maartenst Jun 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"tests"
],
"dependencies": {
"polymer": "^1.0.0",
"leaflet": "^0.7.3"
"polymer": "Polymer/polymer#2.0.0",
"leaflet": "^1.0.0"
}
}
15 changes: 9 additions & 6 deletions leaflet-core.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,15 @@
@demo https://leaflet-extras.github.io/leaflet-map/demo.html
-->
<dom-module id="leaflet-map">
<style>
:host { display: block; }
:host #map {height:100%; width:100%}
</style>
<!-- include stylesheet for shady dom and shadow dom -->
<link rel="stylesheet" href="../leaflet/dist/leaflet.css" />
<link rel="import" type="css" href="../leaflet/dist/leaflet.css" />
<template>
<style>
:host { display: block; }
:host #map {height:100%; width:100%}
</style>

<div id="map"></div>
<content id="markers" select="*"></content>
</template>
Expand Down Expand Up @@ -556,8 +557,10 @@
* @attribute inertia-deceleration
* @type number
*/
inertiaDeceleration: 3000,

inertiaDeceleration: {
type: Number,
value: 3000
},
/**
* The `inertia-max-speed` attribute sets the max speed of the inertial movement, in pixels/second.
*
Expand Down