Add clearer close action, refactor base layer code

[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 915647735a7d4c6bbb2a728ea39dfb34baca2398..dba6205fb926db87bbe8f06d82c4bf3555b08753 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -544,7 +544,7 @@ a.donate {
 
 /* Rules for Leaflet maps */
 
-.leaflet-control a {
+.leaflet-control .control-button {
   display: block;
   height: 40px;
   width: 40px;
@@ -554,11 +554,29 @@ a.donate {
   margin-bottom: 10px;
 }
 
-.leaflet-control a:hover {
+.leaflet-control .zoomin,
+.control-layers .control-button,
+.control-note .control-button {
+  margin-bottom: 0px;
+  border-radius: 4px 4px 0px 0px;
+}
+
+.leaflet-control .zoomout {
+  margin-bottom: 0px;
+  border-radius: 0px;
+}
+
+.control-locate .control-button,
+.control-key .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,39 +584,58 @@ a.donate {
   position: absolute;
   display: none;
   right: 0;
-  width: 200px;
+  width: 250px;
   height: 100%;
   background: white;
+  overflow: auto;
 }
 
-.layers-ui {
+#map-ui {
   section {
     border-top: 1px solid #868e85;
     padding: 15px;
   }
 
+  section:first-child {
+    border-top:0;
+  }
+
+  h2 {
+    margin:0;
+  }
+
+  a.close-button {
+    float: right;
+    padding:5px;
+    font-size:20px;
+    line-height:15px;
+    color:#222;
+    border:1px solid #ddd;
+  }
+
   li {
+    border-radius: 4px;
+    overflow: hidden;
     margin-bottom: 10px;
   }
 
   label {
-    border-radius: 4px;
     display: block;
     padding: 5px;
-    background-color: #868e85;
+    background-color: #eee;
+    cursor: pointer;
   }
 
   li.active label {
-    background-color: #68c879;
+    background-color: #ccc;
   }
 
-  .base-layers {
-    label {
-      border-radius: 0px 0px 4px 4px;
-    }
+  input[type=text] {
+    width:220px;
+  }
 
+  .base-layers {
     .leaflet-container {
-      border-radius: 4px 4px 0px 0px;
       width: 100%;
       height: 50px;
       cursor: pointer;
@@ -749,7 +786,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;
@@ -1241,7 +1277,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;