X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7614534bdb738821e20d04bbf44c4628313ae24f..d48b1ccdf2bfe04c714377f32c6e6afed6560f79:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 99e10d165..9d6ec7d27 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 {
@@ -537,6 +538,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 +557,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 +940,23 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   &:first-child {
     margin-top: 0;
   }
+  &.warning {
+    color: #ff7070;
+    font-weight: bold;
+  }
+  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 +1086,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 {
@@ -1488,6 +1512,9 @@ ul.secondary-actions {
       border-left: 0;
       padding-left: 0;
     }
+    &:last-child {
+      margin-right: 0px;
+    }
   }
 }
 
@@ -1617,12 +1644,13 @@ a.button.submit {
   .richtext_content {
     display: inline-block;
     vertical-align: top;
+    white-space: normal;
 
     .richtext_preview {
       display: inline-block;
       padding: 20px;
       background-color: #f4f4ff;
-      white-space: normal;
+      overflow-x: scroll;
 
       &.loading {
         background-image: image-url("loading.gif");
@@ -1676,3 +1704,61 @@ 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 {
+  h2 {
+    margin-bottom: 10px;
+  }
+
+  div {
+    margin-top: 10px;
+  }
+
+  .permalink {
+    margin: -10px 0 10px -12px;
+  }
+
+  .warning {
+    display: block;
+    background-color: #ff7070;
+    padding: 4px 6px;
+    margin-bottom: 10px;
+  }
+
+  .comment_body {
+    margin-top: 2px;
+    margin-bottom: 2px;
+
+    p {
+      margin-top: 0px;
+      margin-bottom: 0px;
+    }
+  }
+
+  .comment {
+    width: 100%;
+  }
+
+  .buttons {
+    margin-top: 5px;
+    text-align: right;
+  }
+}