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 db14033a5dd94b036942b8b42eef1d8634881dc3..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 {


@@ -802,12 +815,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 #slim_content {
   margin: 10px;
 
 #slim_content {
   margin: 10px;

-  margin-top: 90px;
+  margin-top: 95px;

   max-width: 50em;
   max-width: 50em;

+
+  .content-heading {
+    margin-bottom: 15px;
+  }

 }
 
 #slim_header {
 }
 
 #slim_header {

-  margin: 10px;
+  margin: 30px 10px;

   position: absolute;
   top: 0px;
   margin-right: 5px;
   position: absolute;
   top: 0px;
   margin-right: 5px;


@@ -918,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;


@@ -1133,15 +1158,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   ul,
   ol {
   }
   ul,
   ol {

-    margin-bottom: 20px;

     font-style: italic;
     font-style: italic;

-    margin-left: 20px;
-  }
-  ul li {
-    list-style: disc;
-  }
-  ol li {
-    list-style: decimal;

   }
   ul.secondary-actions { display: inline-block;}
 }
   }
   ul.secondary-actions { display: inline-block;}
 }


@@ -1430,8 +1447,8 @@ textarea {
 /* Rules for user images */
 
 img.user_image {
 /* Rules for user images */
 
 img.user_image {

-  width: 100px;
-  height: 100px;
+  max-width: 100px;
+  max-height: 100px;

   border: 1px solid #ccc;
   margin-bottom: 20px;
   float: left;
   border: 1px solid #ccc;
   margin-bottom: 20px;
   float: left;


@@ -1439,8 +1456,8 @@ img.user_image {
 }
 
 img.user_thumbnail {
 }
 
 img.user_thumbnail {

-  width: 50px;
-  height: 50px;
+  max-width: 50px;
+  max-height: 50px;

   border: 1px solid #ccc;
   margin-right: 20px;
 }
   border: 1px solid #ccc;
   margin-right: 20px;
 }


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

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

   }
 }
 
   }
 }
 


@@ -1530,6 +1550,7 @@ a.button.submit {
     background-color: #9ed485;
   }
 }
     background-color: #9ed485;
   }
 }

+

 /* Rules for doing distinct colour of alternate table rows */
 
 .table0,
 /* Rules for doing distinct colour of alternate table rows */
 
 .table0,


@@ -1549,6 +1570,23 @@ a.button.submit {
   border: 0;
 }
 
   border: 0;
 }
 

+/* Rules for rich text */
+
+.richtext {
+  ul,
+  ol {
+    margin-bottom: 20px;
+    margin-left: 20px;
+  }
+  ul li {
+    list-style: disc;
+  }
+
+  ol li {
+    list-style: decimal;
+  }
+}
+

 /* Rules for rich text editors */
 
 .richtext_container {
 /* Rules for rich text editors */
 
 .richtext_container {


@@ -1611,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;
+  }
+}