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 0d12b758f5c2e304d6c735e05e59c14b6d6eca69..d0dd894eb3f07a10ab5efa2d8d65bfeb469ea18e 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -934,6 +934,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   &:first-child {
     margin-top: 0;
   }
+  &.warning {
+    color: #ff7070;
+    font-weight: bold;
+  }
   h4, p {
     margin-bottom: 5px;
   }
@@ -1504,6 +1508,9 @@ ul.secondary-actions {
       border-left: 0;
       padding-left: 0;
     }
+    &:last-child {
+      margin-right: 0px;
+    }
   }
 }
 
@@ -1661,6 +1668,17 @@ a.button.submit {
 /* 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;