Match the other sidebar better

[rails.git] / app / assets / stylesheets / common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index dba6205fb926db87bbe8f06d82c4bf3555b08753..4afc71533a42304d3a3c3f6f129f82ab7dafb5c7 100644 (file)
--- 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
@@ -555,19 +543,19 @@ a.donate {
 }
 
 .leaflet-control .zoomin,
-.control-layers .control-button,
-.control-note .control-button {
+.control-layers .control-button {
   margin-bottom: 0px;
   border-radius: 4px 4px 0px 0px;
 }
 
-.leaflet-control .zoomout {
+.site .leaflet-control .zoomout,
+.control-key .control-button {
   margin-bottom: 0px;
   border-radius: 0px;
 }
 
+.leaflet-control .zoomout,
 .control-locate .control-button,
-.control-key .control-button,
 .control-share .control-button {
   border-radius: 0px 0px 4px 4px;
 }
@@ -587,28 +575,21 @@ a.donate {
   width: 250px;
   height: 100%;
   background: white;
+  border-left: 1px solid #CCC;
   overflow: auto;
 }
 
 #map-ui {
   section {
-    border-top: 1px solid #868e85;
+    border-bottom: 1px solid #DDD;
     padding: 15px;
   }
 
-  section:first-child {
-    border-top:0;
-  }
-
-  h2 {
-    margin:0;
-  }
-
   a.close-button {
     float: right;
     padding:5px;
     font-size:20px;
-    line-height:15px;
+    line-height:10px;
     color:#222;
     border:1px solid #ddd;
   }
@@ -643,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;
@@ -668,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;
@@ -738,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 {
@@ -762,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;