X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0c8ad2f86edefed72052b402742cadedb0d674d9..2da8c8c413ce7ed6048b32b25c013e0061f54c36:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index d20e4b4c4..93547a207 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -529,19 +529,21 @@ table {
 
 /* Rules for Leaflet maps */
 
-#permalink {
-  z-index: 10000;
-  position: absolute;
-  bottom: 0px;
-  right: 0px;
-  padding: 5px;
-  background:#fff;
-}
+.leaflet-control-attribution {
+  a.disabled {
+    color: #99c9dc;
+    cursor: default;
+    text-decoration: none;
+  }
 
-.leaflet-control-attribution a.disabled {
-  color: #99c9dc;
-  cursor: default;
-  text-decoration: none;
+  ul.secondary-actions {
+    float: left;
+    margin-right: 5px;
+
+    &:only-child {
+      margin-right: 0px;
+    }
+  }
 }
 
 .site-index .leaflet-top,
@@ -563,6 +565,11 @@ table {
   border-top: 0px !important;
 }
 
+.leaflet-popup-content-wrapper {
+  border-radius: 4px !important;
+  -webkit-border-radius: 4px !important;
+}
+
 /* Rules for edit menu */
 
 .menuicon {
@@ -935,15 +942,18 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   &:first-child {
     margin-top: 0;
   }
-  &.warning {
-    color: #ff7070;
-    font-weight: bold;
+  .warning {
+    background-color: #ffe0cc;
+    margin: 0px;
+    padding: 4px 6px;
   }
   h4, p {
     margin-bottom: 5px;
   }
-  p, ul, .bbox {
-    margin-left: 33.3333%;
+  p, ul, .bbox, .geo {
+    display: inline-block;
+    vertical-align: top;
+    max-width: 65%;
   }
   ul p {
     margin-left: 0;
@@ -951,7 +961,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   h4 {
     width: 33.3333%;
-    float: left;
+    display: inline-block;
+    vertical-align: top;
   }
 }
 
@@ -1078,11 +1089,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   min-height: 62px;
 }
 
-.content_map .leaflet-popup-content-wrapper {
--webkit-border-radius: 4px;
-  border-radius: 4px;
-}
-
 /* Rules for user popups on maps */
 
 .user_popup {
@@ -1368,7 +1374,7 @@ p#contributorGuidance {
     background-color: #ff7070;
   }
   &#warning {
-    background-color: #fff6f0;
+    background-color: #ffe0cc;
   }
   &#notice {
     background-color: #CBEEA7;
@@ -1720,21 +1726,47 @@ a.button.submit {
 
 /* Rules for the notes interface */
 
+.note {
+  padding-top: 10px;
+}
+
 .note {
   h2 {
     margin-bottom: 10px;
   }
 
+  div {
+    margin-top: 10px;
+  }
+
+  .permalink {
+    position: absolute;
+    top: 5px;
+    left: 5px;
+    min-width: 15px;
+    min-height: 15px;
+    background: image-url("sprite.png") 0 -45px no-repeat;
+  }
+
+  .permalink span {
+    display: none;
+    padding-left: 20px;
+  }
+
+  .permalink:hover span {
+    display: block;
+  }
+
   .warning {
     display: block;
-    background-color: #ff7070;
+    background-color: #ffe0cc;
     padding: 4px 6px;
     margin-bottom: 10px;
   }
 
   .comment_body {
-    margin-top: 4px;
-    margin-bottom: 4px;
+    margin-top: 2px;
+    margin-bottom: 2px;
 
     p {
       margin-top: 0px;
@@ -1744,6 +1776,7 @@ a.button.submit {
 
   .comment {
     width: 100%;
+    height: 100px;
   }
 
   .buttons {