From: Saman Bemel-Benrud Date: Tue, 30 Jul 2013 17:50:50 +0000 (-0400) Subject: reversed color on map controls and prepped active toggle X-Git-Tag: live~5803^2~13 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/dcbc42b1a485fdf39f5f11e37a628b383843e69b reversed color on map controls and prepped active toggle --- diff --git a/app/assets/images/sprite.png b/app/assets/images/sprite.png index 9f857f852..00c67777f 100644 Binary files a/app/assets/images/sprite.png and b/app/assets/images/sprite.png differ diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index 2e1d309e4..89f101690 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -27,12 +27,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="5" - inkscape:cx="159.62972" - inkscape:cy="181.16738" + inkscape:zoom="1" + inkscape:cx="200.95282" + inkscape:cy="195.08379" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" inkscape:window-width="1280" inkscape:window-height="756" inkscape:window-x="0" @@ -122,7 +122,7 @@ image/svg+xml - + @@ -145,7 +145,7 @@ id="layer1" transform="translate(0,-852.36218)"> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6591-2);enable-background:accumulate" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6591-2);enable-background:accumulate" /> @@ -214,7 +214,7 @@ inkscape:connector-curvature="0" id="path6924" d="m 170,853.3622 -1,1 0,1 -1,0 -1,1 0,2 7,0 0,-2 -1,-1 -1,0 0,-1 -1,-1 -1,0 z m -5,3 -1,1 0,11 1,1 11,0 1,-1 0,-11 -1,-1 -1,0 0,1 0,2 0,8 -9,0 0,-8 0,-2 0,-1 -1,0 z m 3,4 0,1 5,0 0,-1 -5,0 z m 0,2 0,1 5,0 0,-1 -5,0 z m 0,2 0,1 3,0 0,-1 -3,0 z" - style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - + + + + + + diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 8d84f0955..7c6e8095a 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -531,9 +531,10 @@ a.donate { display: block; height: 40px; width: 40px; - background-color: white; - background-color: rgba(255,255,255,.8); - border-radius: 4px; + background-color: #333; + background-color: rgba(0,0,0,.6); + -bottom: 1px solid #333; + border-radius: 4px 0 0 4px; margin-bottom: 10px; outline: none; } @@ -541,23 +542,26 @@ a.donate { .leaflet-control .zoomin, .control-layers .control-button { margin-bottom: 0px; - border-radius: 4px 4px 0px 0px; + border-radius: 4px 0 0 0; } .site .leaflet-control .zoomout, .control-key .control-button { - margin-bottom: 0px; - border-radius: 0px; + margin-bottom: 0; + border-radius: 0; } -.leaflet-control .zoomout, .control-locate .control-button, .control-share .control-button { - border-radius: 0px 0px 4px 4px; + border-radius: 0 0 0 4px; } .leaflet-control .control-button:hover { - background-color: white; + background-color: black; +} + +.leaflet-control .control-button.active { + background-color: #9ed485; } .leaflet-control .control-button .icon { @@ -658,6 +662,7 @@ a.donate { .site-export .leaflet-top { top: $lineheight/2 !important; .leaflet-control { + margin-right: 0px !important; margin-top: 0px !important; } }