Merge pull request #181 from Grsmto/buttons-size-i18n

Buttons horizontal size was hardcoded in JS (fix #180)
Leaflet · Sep 5, 2013 · 39fce3c · winsento · Sep 5, 2013 · 39fce3c
2 parents e3e8076 + 7713edd
commit 39fce3c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/dist/leaflet.draw.css b/dist/leaflet.draw.css
@@ -58,7 +58,7 @@
 }
 
 .leaflet-draw-actions li {
-	float: left;
+	display: inline-block;
 }
 
 .leaflet-draw-actions li:first-child a {
@@ -87,7 +87,8 @@
 	font: 11px/19px "Helvetica Neue", Arial, Helvetica, sans-serif;
 	line-height: 28px;
 	text-decoration: none;
-	width: 50px;
+	padding-left: 10px;
+	padding-right: 10px;
 	height: 28px;
 }
 
@@ -97,6 +98,7 @@
 
 .leaflet-draw-actions-top {
 	margin-top: 1px;
+	white-space: nowrap;
 }
 
 .leaflet-draw-actions-top a,

diff --git a/src/Toolbar.js b/src/Toolbar.js
@@ -128,7 +128,6 @@ L.Toolbar = L.Class.extend({
 		var container = L.DomUtil.create('ul', 'leaflet-draw-actions'),
 			buttonWidth = 50,
 			l = buttons.length,
-			containerWidth = (l * buttonWidth) + (l - 1), //l - 1 = the borders
 			li, button;
 
 		for (var i = 0; i < l; i++) {
@@ -148,8 +147,6 @@ L.Toolbar = L.Class.extend({
 			});
 		}
 
-		container.style.width = containerWidth + 'px';
-
 		return container;
 	},