Update bundle

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c0e0a3686856ba5e071fbd961f7250f72e0a3235..a13f73d7a8ba0a2aa7228b927da1ea54e664f968 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,5 +1,5 @@
 @import "parameters";
 @import "parameters";

-@import "bootstrap-custom";
+@import "bootstrap";

 
 /* Styles common to large and small screens */
 
 
 /* Styles common to large and small screens */
 


@@ -92,25 +92,6 @@ a {
   }
 }
 
   }
 }
 

-/* General styles for tables */
-
-table {
-  width: 100%;
-  margin-bottom: $lineheight;
-  th, td {
-    text-align: left;
-    padding: $lineheight/4;
-    line-height: $lineheight;
-  }
-  th {
-    font-weight: 600;
-    vertical-align: top;
-  }
-  td {
-    vertical-align: middle;
-  }
-}
-

 /* Utility for de-emphasizing content */
 
 .deemphasize {
 /* Utility for de-emphasizing content */
 
 .deemphasize {


@@ -205,6 +186,17 @@ nav.primary {
       }
     }
   }
       }
     }
   }

+
+  // Small tweaks to the toggle to stop the primary colour showing through
+  // when the menu is shown
+  .show > .btn-outline-primary.dropdown-toggle {
+    background-color: $green;
+    border-color: $green;
+
+    &:focus {
+      box-shadow: 0 0 0 0.2rem fade-out($green, 0.5);
+    }
+  }

 }
 
 nav.secondary {
 }
 
 nav.secondary {


@@ -233,6 +225,16 @@ nav.secondary {
       &:hover {
         border-color: $grey;
       }
       &:hover {
         border-color: $grey;
       }

+      &:focus {
+        background-color: white;
+        box-shadow: none;
+      }
+    }
+    &.show .btn-outline-secondary {
+      background-color: white;
+      &:focus {
+        box-shadow: none;
+      }

     }
   }
 
     }
   }
 


@@ -257,6 +259,15 @@ nav.secondary {
   }
 }
 
   }
 }
 

+nav.primary, nav.secondary {
+  .dropdown-item {
+    &:hover, &:active {
+      background-color: $green;
+      color: white;
+    }
+  }
+}
+

 #compact-secondary-nav {
   display: none;
 }
 #compact-secondary-nav {
   display: none;
 }


@@ -743,6 +754,7 @@ header .search_forms,
 
   input[type=text].overflow {
     border-right: none;
 
   input[type=text].overflow {
     border-right: none;

+    border-radius: 3px 0px 0px 3px;

   }
 
   input:focus {
   }
 
   input:focus {


@@ -842,9 +854,6 @@ header .search_forms,
     margin-left: auto;
     margin-right: auto;
   }
     margin-left: auto;
     margin-right: auto;
   }

-  td {
-    padding: 0 $lineheight/4 $lineheight/4 $lineheight/4;
-  }

 }
 
 /* Rules for search sidebar */
 }
 
 /* Rules for search sidebar */


@@ -872,6 +881,7 @@ header .search_forms,
     padding: 5px 20px 10px 15px;
     width: 100%;
     border-collapse: separate;
     padding: 5px 20px 10px 15px;
     width: 100%;
     border-collapse: separate;

+    border-spacing: 0;

 }
 
 div.direction {
 }
 
 div.direction {


@@ -996,6 +1006,8 @@ tr.turn:hover {
     border-radius: 3px;
     table-layout: fixed;
     border-collapse: separate;
     border-radius: 3px;
     table-layout: fixed;
     border-collapse: separate;

+    border-spacing: 0;
+    width: 100%;

 
     th, td {
       border-bottom: 1px solid $grey;
 
     th, td {
       border-bottom: 1px solid $grey;


@@ -1267,18 +1279,6 @@ tr.turn:hover {
   float: right;
 }
 
   float: right;
 }
 

-/* Rules for the trace list shown by the traces tab etc */
-
-#trace_list {
-  border-width: 0px;
-  text-align: right;
-
-  .trace_summary {
-    font-size: 12px;
-    color: gray;
-  }
-}
-

 /* Rules for the new trace form */
 
 #new_trace {
 /* Rules for the new trace form */
 
 #new_trace {


@@ -1591,43 +1591,21 @@ tr.turn:hover {
 /* Rules for messages pages */
 
 .messages {
 /* Rules for messages pages */
 
 .messages {

-  width: 100%;
-  border: 1px solid $grey;
-

   input[type="submit"] {
     margin: auto;
   }
   input[type="submit"] {
     margin: auto;
   }

-  tbody tr {
-    border-top: 1px solid $grey;
-  }

 
   .inbox-row {
     background: $offwhite;
   }
 
   .inbox-row-unread {
 
   .inbox-row {
     background: $offwhite;
   }
 
   .inbox-row-unread {

-    background:#CBEEA7;
+    background: #CBEEA7;

   }
 
   .right {
     float: right;
   }
   }
 
   .right {
     float: right;
   }

-
-  tr td,
-  tr th {
-    padding: $lineheight/4;
-  }
-  p:last-child,
-  h2:last-child,
-  h3:last-child,
-  ol:last-child,
-  ul:last-child {
-    margin-bottom:0;
-  }
-  tr td {
-    height: 30px;
-    border-right: 1px solid $lightgrey;
-  }

 }
 
 .inbox-row .inbox-mark-read {
 }
 
 .inbox-row .inbox-mark-read {


@@ -2015,16 +1993,11 @@ a.button {
   }
 }
 
   }
 }
 

-/* Rules for doing distinct colour of alternate table rows */
-
-.table0,
-.item0 {
-  background: $offwhite;
-}
+/* Customise the background colour of striped tables */

 
 

-.table1,
-.item1 {
-  background: #fff;
+.table-striped > tbody > tr:nth-child(2n+1) > td,
+.table-striped > tbody > tr:nth-child(2n+1) > th {
+   background-color: $offwhite;

 }
 
 /* Rules for OpenID logo */
 }
 
 /* Rules for OpenID logo */


@@ -2164,15 +2137,7 @@ input.richtext_title[type="text"] {
 
 .note_list {
   tr.creator {
 
 .note_list {
   tr.creator {

-    background-color: $lightgrey;
-  }
-
-  td {
-    padding: 3px;
-  }
-
-  p {
-    margin-bottom: 0px;
+    background-color: $offwhite;

   }
 }
 
   }
 }
 


@@ -2380,9 +2345,3 @@ input.richtext_title[type="text"] {
   background: $lightgrey;
   opacity: 0.7;
 }
   background: $lightgrey;
   opacity: 0.7;
 }

-
-.issues-list {
-  td:nth-child(2) {
-    white-space: nowrap;
-  }
-}