Merge remote-tracking branch 'upstream/pull/2548'

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 639e0328ebee82cdd99d1ee285f8647f4b39b5b6..9b6b69db797673f2cdd1a338d7c95e32d01fe9a8 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,5 +1,5 @@
 @import "parameters";
-@import "bootstrap-custom";
+@import "bootstrap";
 
 /* Styles common to large and small screens */
 
@@ -764,10 +764,6 @@ header .search_forms,
     overflow: hidden;
     border-radius: 2px 0 0 2px;
   }
-  
-  input#query {
-    border-radius: 3px 0px 0px 3px;
-  }
 
   input[type=text] {
     width: 100%;
@@ -777,6 +773,7 @@ header .search_forms,
 
   input[type=text].overflow {
     border-right: none;
+    border-radius: 3px 0px 0px 3px;
   }
 
   input:focus {
@@ -2051,16 +2048,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 */