X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/92210a5be1d1f2514a382cdba85d8fe01ffe4440..2c8ed19553808c9f2c9df732a6c60fd3c306aaab:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 4ab90f7ab..b2a23745e 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -511,6 +511,7 @@ table {
 #greeting {
   float: right;
   padding-top: 3px;
+  margin-right: 5px;
 }
 
 .greeting-bar-unread {
@@ -528,13 +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;
+  }
+
+  ul.secondary-actions {
+    float: left;
+    margin-right: 5px;
+
+    &:only-child {
+      margin-right: 0px;
+    }
+  }
 }
 
 .site-index .leaflet-top,
@@ -550,6 +559,17 @@ table {
   left: 10px !important;
 }
 
+.leaflet-popup-scrolled {
+  padding-right: 20px;
+  border-bottom: 0px !important;
+  border-top: 0px !important;
+}
+
+.leaflet-popup-content-wrapper {
+  border-radius: 4px !important;
+  -webkit-border-radius: 4px !important;
+}
+
 /* Rules for edit menu */
 
 .menuicon {
@@ -922,12 +942,24 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   &:first-child {
     margin-top: 0;
   }
+  .warning {
+    background-color: #ffe0cc;
+    margin: 0px;
+    padding: 4px 6px;
+  }
+  div {
+    clear: left;
+  }
   h4, p {
     margin-bottom: 5px;
   }
   p, ul, .bbox {
     margin-left: 33.3333%;
   }
+  ul p {
+    margin-left: 0;
+    margin-bottom: 0;
+  }
   h4 {
     width: 33.3333%;
     float: left;
@@ -1057,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 {
@@ -1347,7 +1374,7 @@ p#contributorGuidance {
     background-color: #ff7070;
   }
   &#warning {
-    background-color: #fff6f0;
+    background-color: #ffe0cc;
   }
   &#notice {
     background-color: #CBEEA7;
@@ -1488,6 +1515,9 @@ ul.secondary-actions {
       border-left: 0;
       padding-left: 0;
     }
+    &:last-child {
+      margin-right: 0px;
+    }
   }
 }
 
@@ -1623,6 +1653,7 @@ a.button.submit {
       display: inline-block;
       padding: 20px;
       background-color: #f4f4ff;
+      overflow-x: scroll;
 
       &.loading {
         background-image: image-url("loading.gif");
@@ -1676,3 +1707,80 @@ a.button.submit {
     }
   }
 }
+
+/* Rules for the user notes list */
+
+.note_list {
+  tr.creator {
+    background-color: #eeeeee;
+  }
+
+  td {
+    padding: 3px;
+  }
+
+  p {
+    margin-bottom: 0px;
+  }
+}
+
+/* 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: #ffe0cc;
+    padding: 4px 6px;
+    margin-bottom: 10px;
+  }
+
+  .comment_body {
+    margin-top: 2px;
+    margin-bottom: 2px;
+
+    p {
+      margin-top: 0px;
+      margin-bottom: 0px;
+    }
+  }
+
+  .comment {
+    width: 100%;
+    height: 100px;
+  }
+
+  .buttons {
+    margin-top: 5px;
+    text-align: right;
+  }
+}