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 062c782a7c13c34328ccc59f10885fe5f03f0b94..0d8b882cba1ab6f084daf3504f008ccf91b3b955 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -469,7 +469,7 @@ table {
 
 .site-index #tabnav a#viewanchor,
 .site-edit #tabnav a#editanchor,
 
 .site-index #tabnav a#viewanchor,
 .site-edit #tabnav a#editanchor,

-.changeset_list #tabnav a#historyanchor,
+.changeset-list #tabnav a#historyanchor,

 .site-export #tabnav a#exportanchor {
   border-bottom: 1px solid #aaa;
   background: #9ed485;
 .site-export #tabnav a#exportanchor {
   border-bottom: 1px solid #aaa;
   background: #9ed485;


@@ -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 {


@@ -789,6 +790,15 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   top: 30px;
 }
 
   top: 30px;
 }
 

+#content.maximised {
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border: 0;
+  z-index: 1000;
+}
+

 #slim_container {
   width: 100%;
 }
 #slim_container {
   width: 100%;
 }


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


@@ -891,7 +905,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     }
   }
   .selected {
     }
   }
   .selected {

-    background-color: rgb(255, 255, 160);
+    background: #FFFFC0;

   }
   .date,
   .user {
   }
   .date,
   .user {


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


@@ -958,28 +980,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   margin-bottom: 10px;
 }
 
   margin-bottom: 10px;
 }
 

-td.browse_comments {
-  padding: 0px;
-
-  table {
-    border-collapse: collapse;
-
-    td {
-      padding-bottom: 10px;
-
-      p {
-        margin-top: 0px;
-        margin-bottom: 0px;
-      }
-
-      span.by {
-        font-size: small;
-        color: #999999;
-      }
-    }
-  }
-}
-

 /* Rules for the trace list shown by the traces tab etc */
 
 #trace_list {
 /* Rules for the trace list shown by the traces tab etc */
 
 #trace_list {


@@ -1039,6 +1039,7 @@ td.browse_comments {
 }
 
 .activity-block {
 }
 
 .activity-block {

+  clear: left;

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


@@ -1157,15 +1158,7 @@ td.browse_comments {
   }
   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;}
 }


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


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


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

-  }
-  .hidden li,
-  .hide_unless_logged_in li,
-  .hide_unless_administrator li {
-    border-left: 1px solid #ccc;
-    padding-left: 5px;
+    &:last-child {
+      margin-right: 0px;

     }
     }

-  .hidden:first-child li,
-  .hide_unless_logged_in:first-child li,
-  .hide_unless_administrator:first-child li {
-    border-left: 0;
-    padding-left: 0;

   }
 }
 
   }
 }
 


@@ -1566,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,


@@ -1585,55 +1570,79 @@ 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 {
   white-space: nowrap;
 /* Rules for rich text editors */
 
 .richtext_container {
   white-space: nowrap;

+

   .richtext_content {
     display: inline-block;
     vertical-align: top;
   .richtext_content {
     display: inline-block;
     vertical-align: top;

+

     .richtext_preview {
       display: inline-block;
       padding: 20px;
       background-color: #f4f4ff;
       white-space: normal;
     .richtext_preview {
       display: inline-block;
       padding: 20px;
       background-color: #f4f4ff;
       white-space: normal;

+

       &.loading {
         background-image: image-url("loading.gif");
         background-repeat: no-repeat;
         background-position: center;
       }
       &.loading {
         background-image: image-url("loading.gif");
         background-repeat: no-repeat;
         background-position: center;
       }

+

       > :first-child {
         margin-top: 0px;
       }
     }
   }
       > :first-child {
         margin-top: 0px;
       }
     }
   }

+

   .richtext_help {
     display: inline-block;
     vertical-align: top;
     margin-left: 15px;
     background-color: #f8f8ff;
     padding: 20px;
   .richtext_help {
     display: inline-block;
     vertical-align: top;
     margin-left: 15px;
     background-color: #f8f8ff;
     padding: 20px;

+

     p {
       margin: 0px;
     }
     p {
       margin: 0px;
     }

+

     th {
       vertical-align: top;
       text-align: left;
       padding: 0px 15px 0px 0px !important;
     }
     th {
       vertical-align: top;
       text-align: left;
       padding: 0px 15px 0px 0px !important;
     }

-    table > thead th {
-      font-weight: bold;
-    }
+

     td {
       font-family: fixed;
       line-height: 16px;
       text-align: left;
       padding: 0px !important;
     }
     td {
       font-family: fixed;
       line-height: 16px;
       text-align: left;
       padding: 0px !important;
     }

+

     input.richtext_doedit {
       margin-top: 5px !important;
       margin-right: 10px !important;
     }
     input.richtext_doedit {
       margin-top: 5px !important;
       margin-right: 10px !important;
     }

+

     input.richtext_dopreview {
       margin-top: 5px !important;
       margin-left: 10px !important;
     input.richtext_dopreview {
       margin-top: 5px !important;
       margin-left: 10px !important;


@@ -1641,9 +1650,36 @@ 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 {
 /* 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;
   .comment_body {
     margin-top: 4px;
     margin-bottom: 4px;


@@ -1654,6 +1690,10 @@ a.button.submit {
     }
   }
 
     }
   }
 

+  .comment {
+    width: 100%;
+  }
+

   .buttons {
     margin-top: 5px;
     text-align: right;
   .buttons {
     margin-top: 5px;
     text-align: right;