From 8a8b2be454f491ed254e7357dd56a0d40520c166 Mon Sep 17 00:00:00 2001 From: Vladimir Agafonkin Date: Fri, 9 Nov 2012 15:34:48 +0200 Subject: [PATCH] CSS whitespace fixes --- dist/leaflet.css | 133 ++++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 65 deletions(-) diff --git a/dist/leaflet.css b/dist/leaflet.css index 86b62a1c..938a1be5 100644 --- a/dist/leaflet.css +++ b/dist/leaflet.css @@ -18,44 +18,45 @@ } .leaflet-container { overflow: hidden; + -ms-touch-action: none; } .leaflet-tile, .leaflet-marker-icon, .leaflet-marker-shadow { - -moz-user-select: none; -webkit-user-select: none; - user-select: none; + -moz-user-select: none; + user-select: none; } .leaflet-marker-icon, .leaflet-marker-shadow { display: block; } +/* map is broken in FF if you have max-width: 100% on tiles */ .leaflet-container img { - /* map is broken in FF if you have max-width: 100% on tiles */ max-width: none !important; } +/* stupid Android 2 doesn't understand "max-width: none" properly */ .leaflet-container img.leaflet-image-layer { - /* stupid Android 2 doesn't understand "max-width: none" properly */ - max-width: 15000px !important; - } + max-width: 15000px !important; + } .leaflet-tile { - filter: inherit; - visibility: hidden; + filter: inherit; + visibility: hidden; } .leaflet-tile-loaded { visibility: inherit; } .leaflet-zoom-box { - width: 0; - height: 0; - } + width: 0; + height: 0; + } -.leaflet-tile-pane { z-index: 2; } +.leaflet-tile-pane { z-index: 2; } .leaflet-objects-pane { z-index: 3; } .leaflet-overlay-pane { z-index: 4; } -.leaflet-shadow-pane { z-index: 5; } -.leaflet-marker-pane { z-index: 6; } -.leaflet-popup-pane { z-index: 7; } +.leaflet-shadow-pane { z-index: 5; } +.leaflet-marker-pane { z-index: 6; } +.leaflet-popup-pane { z-index: 7; } /* control positioning */ @@ -106,33 +107,33 @@ /* zoom and fade animations */ -.leaflet-fade-anim .leaflet-tile, .leaflet-fade-anim .leaflet-popup { +.leaflet-fade-anim .leaflet-tile, +.leaflet-fade-anim .leaflet-popup { opacity: 0; - -webkit-transition: opacity 0.2s linear; - -moz-transition: opacity 0.2s linear; - -o-transition: opacity 0.2s linear; - transition: opacity 0.2s linear; + -moz-transition: opacity 0.2s linear; + -o-transition: opacity 0.2s linear; + transition: opacity 0.2s linear; } -.leaflet-fade-anim .leaflet-tile-loaded, .leaflet-fade-anim .leaflet-map-pane .leaflet-popup { +.leaflet-fade-anim .leaflet-tile-loaded, +.leaflet-fade-anim .leaflet-map-pane .leaflet-popup { opacity: 1; } .leaflet-zoom-anim .leaflet-zoom-animated { -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1); - -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1); - -o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1); - transition: transform 0.25s cubic-bezier(0,0,0.25,1); + -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1); + -o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1); + transition: transform 0.25s cubic-bezier(0,0,0.25,1); } - .leaflet-zoom-anim .leaflet-tile, .leaflet-pan-anim .leaflet-tile, .leaflet-touching .leaflet-zoom-animated { - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; - } + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; + } .leaflet-zoom-anim .leaflet-zoom-hide { visibility: hidden; @@ -145,17 +146,19 @@ cursor: pointer; } .leaflet-container { - -ms-touch-action: none; cursor: -webkit-grab; - cursor: -moz-grab; + cursor: -moz-grab; } -.leaflet-popup-pane, .leaflet-control { +.leaflet-popup-pane, +.leaflet-control { cursor: auto; } -.leaflet-dragging, .leaflet-dragging .leaflet-clickable, .leaflet-dragging .leaflet-container { +.leaflet-dragging, +.leaflet-dragging .leaflet-clickable, +.leaflet-dragging .leaflet-container { cursor: move; cursor: -webkit-grabbing; - cursor: -moz-grabbing; + cursor: -moz-grabbing; } @@ -169,8 +172,8 @@ color: #0078A8; } .leaflet-container a.leaflet-active { - outline: 2px solid orange; - } + outline: 2px solid orange; + } .leaflet-zoom-box { border: 2px dotted #05f; background: white; @@ -178,32 +181,35 @@ } +/* general typography */ +.leaflet-container { + font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; +} + + /* zoom control */ .leaflet-control-zoom { - -moz-border-radius: 7px; -webkit-border-radius: 7px; - border-radius: 7px; + border-radius: 7px; } .leaflet-control-zoom { padding: 5px; background: rgba(0, 0, 0, 0.25); } .leaflet-control-zoom a { + width: 19px; + height: 19px; background-color: rgba(255, 255, 255, 0.75); + -webkit-border-radius: 4px; + border-radius: 4px; } -.leaflet-control-zoom a, .leaflet-control-layers-toggle { +.leaflet-control-zoom a, +.leaflet-control-layers-toggle { background-position: 50% 50%; background-repeat: no-repeat; display: block; } -.leaflet-control-zoom a { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - width: 19px; - height: 19px; - } .leaflet-control-zoom a:hover { background-color: #fff; } @@ -225,9 +231,8 @@ .leaflet-control-layers { box-shadow: 0 1px 7px #999; background: #f8f8f9; - -moz-border-radius: 8px; -webkit-border-radius: 8px; - border-radius: 8px; + border-radius: 8px; } .leaflet-control-layers-toggle { background-image: url(images/layers.png); @@ -248,7 +253,6 @@ } .leaflet-control-layers-expanded { padding: 6px 10px 6px 6px; - font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; color: #333; background: #fff; } @@ -273,7 +277,7 @@ background-color: rgba(255, 255, 255, 0.7); box-shadow: 0 0 5px #bbb; margin: 0; - } + } .leaflet-control-attribution, .leaflet-control-scale-line { padding: 0 5px; @@ -281,7 +285,7 @@ } .leaflet-container .leaflet-control-attribution, .leaflet-container .leaflet-control-scale { - font: 11px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; + font-size: 11px; } .leaflet-left .leaflet-control-scale { margin-left: 5px; @@ -326,14 +330,12 @@ .leaflet-popup-content-wrapper { padding: 1px; text-align: left; - - -moz-border-radius: 20px; -webkit-border-radius: 20px; - border-radius: 20px; + border-radius: 20px; } .leaflet-popup-content { margin: 14px 20px; - font: 12px/1.4 "Helvetica Neue", Arial, Helvetica, sans-serif; + line-height: 1.4; } .leaflet-popup-content p { margin: 18px 0; @@ -352,11 +354,11 @@ margin: -8px auto 0; - -moz-transform: rotate(45deg); -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); } .leaflet-popup-content-wrapper, .leaflet-popup-tip { background: white; @@ -390,9 +392,10 @@ /* div icon */ .leaflet-div-icon { - background: #fff; - border: 1px solid #666; - } + background: #fff; + border: 1px solid #666; + } .leaflet-editing-icon { - border-radius: 2px; - } + -webkit-border-radius: 2px; + border-radius: 2px; + }