Skip to content

Commit

Permalink
Merge pull request #221 from frankrowe/master
Browse files Browse the repository at this point in the history
Combines IE conditional styles into main styles
  • Loading branch information
jacobtoye committed Nov 24, 2013
2 parents 43e8edb + 075fecd commit 7a61503
Show file tree
Hide file tree
Showing 5 changed files with 290 additions and 205 deletions.
52 changes: 52 additions & 0 deletions dist/leaflet.draw.css
Original file line number Diff line number Diff line change
Expand Up @@ -242,3 +242,55 @@
.leaflet-edit-resize {
cursor: pointer;
}

/* ================================================================== */
/* Old IE styles
/* ================================================================== */

.leaflet-oldie .leaflet-draw-toolbar {
border: 3px solid #999;
}

.leaflet-oldie .leaflet-draw-toolbar a {
background-color: #eee;
}

.leaflet-oldie .leaflet-draw-toolbar a:hover {
background-color: #fff;
}

.leaflet-oldie .leaflet-draw-actions {
left: 32px;
margin-top: 3px;
}

.leaflet-oldie .leaflet-draw-actions li {
display: inline;
zoom: 1;
}

.leaflet-oldie .leaflet-edit-marker-selected {
border: 4px dashed #fe93c2;
}

.leaflet-oldie .leaflet-draw-actions a {
background-color: #999;
}

.leaflet-oldie .leaflet-draw-actions a:hover {
background-color: #a5a5a5;
}

.leaflet-oldie .leaflet-draw-actions-top a {
margin-top: 1px;
}

.leaflet-oldie .leaflet-draw-actions-bottom a {
height: 28px;
line-height: 28px;
}

.leaflet-oldie .leaflet-draw-actions-top.leaflet-draw-actions-bottom a {
height: 27px;
line-height: 27px;
}
49 changes: 0 additions & 49 deletions dist/leaflet.draw.ie.css

This file was deleted.

2 changes: 1 addition & 1 deletion examples/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<link rel="stylesheet" href="libs/leaflet.css" />
<link rel="stylesheet" href="../dist/leaflet.draw.css" />
<!--[if lte IE 8]><link rel="stylesheet" href="../dist/leaflet.draw.ie.css" /><![endif]-->


<script src="libs/leaflet-src.js"></script>

Expand Down
1 change: 0 additions & 1 deletion examples/edithandlers.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<title>Leaflet.draw vector editing handlers</title>

<link rel="stylesheet" href="libs/leaflet.css" />
<!--[if lte IE 8]><link rel="stylesheet" href="libs/leaflet.ie.css" /><![endif]-->

<script src="libs/leaflet-src.js"></script>

Expand Down
Loading

0 comments on commit 7a61503

Please sign in to comment.