Don't try and add a note when the control is disabled

[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 2837270fdf654fd035841a0b6b29dc08c7cab25c..96856228c0b1b23acde7a14cf42853bc8a574469 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -332,6 +332,7 @@ h2 {
 
 #top-bar {
   position: absolute;
 
 #top-bar {
   position: absolute;

+  z-index: 10000;

   top: 0;
   left: 185px;
   right: 0;
   top: 0;
   left: 185px;
   right: 0;


@@ -430,7 +431,7 @@ body.site-export #tabnav a#exportanchor {
   left: 15px;
 }
 
   left: 15px;
 }
 

-/* Rules for OpenLayers maps */
+/* Rules for Leaflet maps */

 
 #map {
   margin: 0px;
 
 #map {
   margin: 0px;


@@ -438,13 +439,6 @@ body.site-export #tabnav a#exportanchor {
   padding: 0px;
 }
 
   padding: 0px;
 }
 

-.olControlAttribution {
-  bottom: 15px !important;
-  left: 0px !important;
-  right: 0px !important;
-  text-align: center;
-}
-

 #permalink {
   z-index: 10000;
   position: absolute;
 #permalink {
   z-index: 10000;
   position: absolute;


@@ -460,11 +454,19 @@ body.site-export #tabnav a#exportanchor {
   padding: 5px;
 }
 
   padding: 5px;
 }
 

-.site-index #map .SimpleLayerSwitcher,
-.site-index #map .olControlSimplePanZoom,
-.site-export #map .SimpleLayerSwitcher,
-.site-export #map .olControlSimplePanZoom {
+.leaflet-control-attribution a.disabled {
+  color: #99c9dc;
+  cursor: default;
+  text-decoration: none;
+}
+
+.site-index .leaflet-top,
+.site-export .leaflet-top {

   top: 40px !important;
   top: 40px !important;

+
+  .leaflet-control {
+    margin-top: 0px !important;
+  }

 }
 
 .site-index #map .olControlScaleLine,
 }
 
 .site-index #map .olControlScaleLine,


@@ -472,6 +474,12 @@ body.site-export #tabnav a#exportanchor {
   left: 10px !important;
 }
 
   left: 10px !important;
 }
 

+.leaflet-popup-scrolled {
+  padding-right: 20px;
+  border-bottom: 0px !important;
+  border-top: 0px !important;
+}
+

 /* Rules for edit menu */
 
 .menuicon {
 /* Rules for edit menu */
 
 .menuicon {


@@ -825,6 +833,28 @@ table.browse_details th {
   white-space: nowrap;
 }
 
   white-space: nowrap;
 }
 

+td.browse_comments {
+  padding: 0px;
+
+  table {
+    border-collapse: collapse;
+
+    td {
+      padding-bottom: 10px;
+
+      p {
+        margin-top: 0px;
+        margin-bottom: 0px;
+      }
+
+      span.by {
+        font-size: small;
+        color: #999999;
+      }
+    }
+  }
+}
+

 #browse_map {
   float: right;
   width: 250px;
 #browse_map {
   float: right;
   width: 250px;


@@ -1098,16 +1128,21 @@ p#contributorGuidance {
 
 /* Rules for the user map */
 
 
 /* Rules for the user map */
 

-.user_map .olControlSimplePanZoom {
+.user_map .leaflet-control-pan,
+.user_map .leaflet-control-zoomslider {

   display: none;
 }
 
   display: none;
 }
 

-.user_map .olControlZoom {
+.user_map .leaflet-control-zoom {

   display: block;
 }
 
 /* Rules for user popups on maps */
 
   display: block;
 }
 
 /* Rules for user popups on maps */
 

+.user_popup {
+  min-width: 200px;
+}
+

 .user_popup p {
   padding-top: 3px;
   padding-bottom: 3px;
 .user_popup p {
   padding-top: 3px;
   padding-bottom: 3px;


@@ -1390,3 +1425,22 @@ abbr.geo {
     }
   }
 }
     }
   }
 }

+
+/* Rules for the notes interface */
+
+.note {
+  .comment_body {
+    margin-top: 4px;
+    margin-bottom: 4px;
+
+    p {
+      margin-top: 0px;
+      margin-bottom: 0px;
+    }
+  }
+
+  .buttons {
+    margin-top: 5px;
+    text-align: right;
+  }
+}