X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5e9ab5bc5edb63b7ab7719fa989a18f52e3637a2..5c0aeb1558a778cd5790be5e062c2df7d9b51da6:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 6ce66b665..4afc71533 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -162,6 +162,7 @@ h6:first-child {
 .icon.zoomin      { background-position: -40px 0; }
 .icon.zoomout     { background-position: -60px 0; }
 .icon.geolocate   { background-position: -80px 0; }
+.active .icon.geolocate   { background-position: -80px -20px; }
 .icon.layers      { background-position: -100px 0; }
 .icon.key         { background-position: -120px 0; }
 .icon.share       { background-position: -140px 0; }
@@ -337,19 +338,6 @@ table {
   }
 }
 
-/* Rules for SOTM advert */
-
-#sotm {
-  width: 165px;
-  margin: $lineheight/2;
-  padding: 0px;
-  border: 0px;
-  background: #fff;
-  img {
-    width: 165px;
-  }
-}
-
 /*
  * Rules for "optional boxes" which appear in the left sidebar on
  * certain pages. Current users are the seach box on the main page
@@ -544,7 +532,7 @@ a.donate {
 
 /* Rules for Leaflet maps */
 
-.leaflet-control a {
+.leaflet-control .control-button {
   display: block;
   height: 40px;
   width: 40px;
@@ -554,11 +542,29 @@ a.donate {
   margin-bottom: 10px;
 }
 
-.leaflet-control a:hover {
+.leaflet-control .zoomin,
+.control-layers .control-button {
+  margin-bottom: 0px;
+  border-radius: 4px 4px 0px 0px;
+}
+
+.site .leaflet-control .zoomout,
+.control-key .control-button {
+  margin-bottom: 0px;
+  border-radius: 0px;
+}
+
+.leaflet-control .zoomout,
+.control-locate .control-button,
+.control-share .control-button {
+  border-radius: 0px 0px 4px 4px;
+}
+
+.leaflet-control .control-button:hover {
   background-color: white;
 }
 
-.leaflet-control a .icon {
+.leaflet-control .control-button .icon {
   margin: 10px;
 }
 
@@ -566,17 +572,28 @@ a.donate {
   position: absolute;
   display: none;
   right: 0;
-  width: 200px;
+  width: 250px;
   height: 100%;
   background: white;
+  border-left: 1px solid #CCC;
+  overflow: auto;
 }
 
-.layers-ui {
+#map-ui {
   section {
-    border-top: 1px solid #868e85;
+    border-bottom: 1px solid #DDD;
     padding: 15px;
   }
 
+  a.close-button {
+    float: right;
+    padding:5px;
+    font-size:20px;
+    line-height:10px;
+    color:#222;
+    border:1px solid #ddd;
+  }
+
   li {
     border-radius: 4px;
     overflow: hidden;
@@ -586,12 +603,16 @@ a.donate {
   label {
     display: block;
     padding: 5px;
-    background-color: #868e85;
+    background-color: #eee;
     cursor: pointer;
   }
 
   li.active label {
-    background-color: #68c879;
+    background-color: #ccc;
+  }
+
+  input[type=text] {
+    width:220px;
   }
 
   .base-layers {
@@ -603,23 +624,6 @@ a.donate {
   }
 }
 
-.leaflet-control-attribution {
-  a.disabled {
-    color: #99c9dc;
-    cursor: default;
-    text-decoration: none;
-  }
-
-  ul.secondary-actions {
-    float: left;
-    margin-right: $lineheight/4;
-
-    &:only-child {
-      margin-right: 0px;
-    }
-  }
-}
-
 .site-index .leaflet-top,
 .site-export .leaflet-top {
   top: $lineheight/2 !important;
@@ -628,11 +632,6 @@ a.donate {
   }
 }
 
-.site-index #map .olControlScaleLine,
-.site-export #map .olControlScaleLine {
-  left: $lineheight/2 !important;
-}
-
 .leaflet-popup-scrolled {
   padding-right: $lineheight;
   border-bottom: 0px !important;
@@ -698,16 +697,6 @@ a.donate {
   left: 0px;
   border-right: 1px solid $keyline;
   width: 33.3333%;
-  .sidebar_heading {
-    position: relative;
-    padding: $lineheight/2 $lineheight;
-    z-index: 9999;
-    background: $offwhite;
-    border-bottom: 1px solid #ccc;
-  }
-  h4 {
-    margin: 0;
-  }
   ul {
     margin-bottom: 0;
     &:last-child {
@@ -722,7 +711,18 @@ a.donate {
   }
 }
 
-#sidebar_close {
+.sidebar_heading {
+  position: relative;
+  padding: $lineheight/2 $lineheight;
+  z-index: 9999;
+  background: $offwhite;
+  border-bottom: 1px solid #ccc;
+  h4 {
+    margin: 0;
+  }
+}
+
+.sidebar_close {
   position: absolute;
   height: $lineheight;
   top: 0px;
@@ -746,7 +746,6 @@ a.donate {
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey {
-  padding: $lineheight $lineheight 0 $lineheight;
  .mapkey-table-key img {
     display: block;
     margin-left: auto;
@@ -1238,7 +1237,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   h1, h2 {
     font-size: 21px;
-    line-height: 1;
+    line-height: 1em;
   }
   small.deemphasize {
     float: left;