Clean up some of the map JS, reduce scope of globals

[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 7331e201a40d3406d4ac07590198be5341f29b24..80cb000c51fd874b9e01d39cea4cde93f3e16bfc 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -518,6 +518,13 @@ table {
 }
 
 /* Rules for Leaflet maps */
 }
 
 /* Rules for Leaflet maps */

+.leaflet-control-layers-expanded {
+  padding: 10px !important;
+}
+
+.leaflet-control-layers-separator {
+  margin: 5px -10px !important;
+}

 
 .leaflet-control-attribution {
   a.disabled {
 
 .leaflet-control-attribution {
   a.disabled {


@@ -1354,6 +1361,13 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   tr th {
     padding: $lineheight/4;
   }
   tr th {
     padding: $lineheight/4;
   }

+  p:last-child,
+  h2:last-child,
+  h3:last-child,
+  ol:last-child,
+  ul:last-child {
+    margin-bottom:0;
+  }

   tr td {
     height: 30px;
     border-right: 1px solid $keyline;
   tr td {
     height: 30px;
     border-right: 1px solid $keyline;


@@ -1426,11 +1440,12 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 #errorExplanation {
   width: 400px;
   border: 2px solid #ff7070;
 #errorExplanation {
   width: 400px;
   border: 2px solid #ff7070;

-  padding: $lineheight/2;
+  padding: 0 $lineheight/2;

   margin-bottom: $lineheight;
   background-color: #f0f0f0;
   margin-bottom: $lineheight;
   background-color: #f0f0f0;

+

   h2 {
   h2 {

-    margin: -10px;
+    margin: 0 -10px 10px -10px;

     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
     font-weight: bold;
     font-size: 12px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
     font-weight: bold;
     font-size: 12px;


@@ -1445,11 +1460,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     padding: $lineheight/4;
   }
 
     padding: $lineheight/4;
   }
 

-  ul li {
-    font-size: 12px;
-    list-style: disc;
-  }
+  ul {
+    padding-left: $lineheight;

 
 

+    li {
+      font-size: 12px;
+      list-style: disc;
+    }
+  }

 }
 
 /* Rules for forms */
 }
 
 /* Rules for forms */


@@ -1494,7 +1512,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   input[type="radio"] {
     float: left;
     margin-top: 5px;
   input[type="radio"] {
     float: left;
     margin-top: 5px;

-    margin-right: 5px;

   }
 }
 
   }
 }
 


@@ -1502,6 +1519,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   display: block;
 }
 
   display: block;
 }
 

+input[type="checkbox"],
+input[type="radio"] {
+    margin-right: 5px;
+}
+

 input[type="text"],
 input[type="email"],
 input[type="url"],
 input[type="text"],
 input[type="email"],
 input[type="url"],


@@ -1627,6 +1649,9 @@ a.button {
       background: darken($lightblue, $hovercolor);
     }
   }
       background: darken($lightblue, $hovercolor);
     }
   }

+  &:disabled {
+    background: $lightblue;
+  }

   &:last-child {
     margin-bottom: 0;
   }
   &:last-child {
     margin-bottom: 0;
   }


@@ -1640,27 +1665,40 @@ a.button {
   .button {
     box-sizing: border-box;
     float: left;
   .button {
     box-sizing: border-box;
     float: left;

-    margin-bottom:0;
+    border-radius: 0;
+    margin:0;

     min-width: 100px;
     max-width: 150px;
     min-width: 100px;
     max-width: 150px;

+    border-right:1px solid white;

   }
   input:first-child,
   .button:first-child {
     border-radius:2px 0 0 2px;
   }
   input:first-child,
   .button:first-child {
     border-radius:2px 0 0 2px;

-    border-right:1px solid white;
-    margin-left: 0px;

   }
   input:last-child,
   .button:last-child {
     border-radius:0 2px 2px 0;
   }
   input:last-child,
   .button:last-child {
     border-radius:0 2px 2px 0;

-    margin-right: 0px;
+    border-right-width: 0;

   }
   input:only-child,
   }
   input:only-child,

-  .button:only-child {
+  .button:only-child,
+  *[value="Hide"] + input:last-child,
+  *[value="Hide"] + .button:last-child {

     border-radius:2px;
     border-radius:2px;

-    margin-right: 0px;
+    border-right-width: 0;
+  }
+    /* if a 3-button set has a hidden middle button */
+  *[value="Hide"] + input:nth-child(3),
+  *[value="Hide"] + .button:nth-child(3) {
+    border-radius:0 2px 2px 0;
+    border-right-width: 0;
+  }
+  /* if a 3-button set starts with a hidden button */
+  *[value="Hide"] + input:nth-child(2):not(:last-child),
+  *[value="Hide"] + .button:nth-child(2):not(:last-child) {
+    border-radius:2px 0 0 2px;
+    border-right-width: 1px solid white;

   }
   }

-

 }
 
 /* Rules for doing distinct colour of alternate table rows */
 }
 
 /* Rules for doing distinct colour of alternate table rows */


@@ -1794,8 +1832,7 @@ a.button {
     margin-left: 15px;
     background-color: #f8f8ff;
     padding: $lineheight/2;
     margin-left: 15px;
     background-color: #f8f8ff;
     padding: $lineheight/2;

-    width: 300px;
-    max-width: 450px;
+    width: 220px;

 
     ul {
       margin-bottom: 0;
 
     ul {
       margin-bottom: 0;


@@ -1814,12 +1851,12 @@ a.button {
     }
 
     li h4 {
     }
 
     li h4 {

-      width: 35%;
+      width: 40%;

       margin: 0;
     }
 
     li span, li p {
       margin: 0;
     }
 
     li span, li p {

-      width: 60%;
+      width: 50%;

       margin-left: $lineheight/2;
       margin-bottom: $lineheight/4;
       white-space: nowrap;
       margin-left: $lineheight/2;
       margin-bottom: $lineheight/4;
       white-space: nowrap;