Display formatted notes in the web UI

[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 ec06997f8fc0bf4f93200d7a312e004b68b5878f..5174e475d5e8063995ef7b5b13a481e34d49d6e3 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;
+  z-index: 10000;
   top: 0;
   left: 185px;
   right: 0;
@@ -430,7 +431,7 @@ body.site-export #tabnav a#exportanchor {
   left: 15px;
 }
 
-/* Rules for OpenLayers maps */
+/* Rules for Leaflet maps */
 
 #map {
   margin: 0px;
@@ -438,13 +439,6 @@ body.site-export #tabnav a#exportanchor {
   padding: 0px;
 }
 
-.olControlAttribution {
-  bottom: 15px !important;
-  left: 0px !important;
-  right: 0px !important;
-  text-align: center;
-}
-
 #permalink {
   z-index: 10000;
   position: absolute;
@@ -466,11 +460,13 @@ body.site-export #tabnav a#exportanchor {
   text-decoration: none;
 }
 
-.site-index #map .SimpleLayerSwitcher,
-.site-index #map .olControlSimplePanZoom,
-.site-export #map .SimpleLayerSwitcher,
-.site-export #map .olControlSimplePanZoom {
+.site-index .leaflet-top,
+.site-export .leaflet-top {
   top: 40px !important;
+
+  .leaflet-control {
+    margin-top: 0px !important;
+  }
 }
 
 .site-index #map .olControlScaleLine,
@@ -478,6 +474,12 @@ body.site-export #tabnav a#exportanchor {
   left: 10px !important;
 }
 
+.leaflet-popup-scrolled {
+  padding-right: 20px;
+  border-bottom: 0px !important;
+  border-top: 0px !important;
+}
+
 /* Rules for edit menu */
 
 .menuicon {
@@ -833,19 +835,24 @@ table.browse_details th {
 
 td.browse_comments {
   padding: 0px;
-}
 
-td.browse_comments table {
-  border-collapse: collapse;
-}
+  table {
+    border-collapse: collapse;
 
-td.browse_comments table td {
-  padding-bottom: 10px;
-}
+    td {
+      padding-bottom: 10px;
 
-td.browse_comments table td span.by {
-  font-size: small;
-  color: #999999;
+      p {
+        margin-top: 0px;
+        margin-bottom: 0px;
+      }
+
+      span.by {
+        font-size: small;
+        color: #999999;
+      }
+    }
+  }
 }
 
 #browse_map {
@@ -1121,16 +1128,21 @@ p#contributorGuidance {
 
 /* Rules for the user map */
 
-.user_map .olControlSimplePanZoom {
+.user_map .leaflet-control-pan,
+.user_map .leaflet-control-zoomslider {
   display: none;
 }
 
-.user_map .olControlZoom {
+.user_map .leaflet-control-zoom {
   display: block;
 }
 
 /* Rules for user popups on maps */
 
+.user_popup {
+  min-width: 200px;
+}
+
 .user_popup p {
   padding-top: 3px;
   padding-bottom: 3px;
@@ -1417,7 +1429,15 @@ abbr.geo {
 /* Rules for the notes interface */
 
 .note {
-  width: 300px;
+  .comment_body {
+    margin-top: 4px;
+    margin-bottom: 4px;
+
+    p {
+      margin-top: 0px;
+      margin-bottom: 0px;
+    }
+  }
 
   .buttons {
     margin-top: 5px;