Merge branch 'master' into notes

[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 e57db18ce4a17890287203acd78d19dfa731fa71..5fe4ec97bfe183128617c0a6511f4d5a192da6e3 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -537,6 +537,12 @@ table {
   background:#fff;
 }
 
+.leaflet-control-attribution a.disabled {
+  color: #99c9dc;
+  cursor: default;
+  text-decoration: none;
+}
+
 .site-index .leaflet-top,
 .site-export .leaflet-top {
   top: 10px !important;
@@ -550,6 +556,12 @@ table {
   left: 10px !important;
 }
 
+.leaflet-popup-scrolled {
+  padding-right: 20px;
+  border-bottom: 0px !important;
+  border-top: 0px !important;
+}
+
 /* Rules for edit menu */
 
 .menuicon {
@@ -928,6 +940,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   p, ul, .bbox {
     margin-left: 33.3333%;
   }
+  ul p {
+    margin-left: 0;
+    margin-bottom: 0;
+  }
   h4 {
     width: 33.3333%;
     float: left;
@@ -1625,3 +1641,26 @@ a.button.submit {
     }
   }
 }
+
+/* Rules for the notes interface */
+
+.note {
+  .comment_body {
+    margin-top: 4px;
+    margin-bottom: 4px;
+
+    p {
+      margin-top: 0px;
+      margin-bottom: 0px;
+    }
+  }
+
+  .comment {
+    width: 100%;
+  }
+
+  .buttons {
+    margin-top: 5px;
+    text-align: right;
+  }
+}