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..0d8b882cba1ab6f084daf3504f008ccf91b3b955 100644 (file)
--- 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;
 #greeting {
   float: right;
   padding-top: 3px;

+  margin-right: 5px;

 }
 
 .greeting-bar-unread {
 }
 
 .greeting-bar-unread {


@@ -537,6 +538,12 @@ table {
   background:#fff;
 }
 
   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;
 .site-index .leaflet-top,
 .site-export .leaflet-top {
   top: 10px !important;


@@ -550,6 +557,12 @@ table {
   left: 10px !important;
 }
 
   left: 10px !important;
 }
 

+.leaflet-popup-scrolled {
+  padding-right: 20px;
+  border-bottom: 0px !important;
+  border-top: 0px !important;
+}
+

 /* Rules for edit menu */
 
 .menuicon {
 /* Rules for edit menu */
 
 .menuicon {


@@ -922,12 +935,20 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   &:first-child {
     margin-top: 0;
   }
   &:first-child {
     margin-top: 0;
   }

+  &.warning {
+    color: #ff7070;
+    font-weight: bold;
+  }

   h4, p {
     margin-bottom: 5px;
   }
   p, ul, .bbox {
     margin-left: 33.3333%;
   }
   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;
   h4 {
     width: 33.3333%;
     float: left;


@@ -1488,6 +1509,9 @@ ul.secondary-actions {
       border-left: 0;
       padding-left: 0;
     }
       border-left: 0;
       padding-left: 0;
     }

+    &:last-child {
+      margin-right: 0px;
+    }

   }
 }
 
   }
 }
 


@@ -1625,3 +1649,53 @@ 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;
+  }
+
+  .warning {
+    display: block;
+    background-color: #ff7070;
+    padding: 4px 6px;
+    margin-bottom: 10px;
+  }
+
+  .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;
+  }
+}