Zurich admin table styles carried across to default admin templates, and tidy display of admin a bit.

4 files changed, 55 insertions, 53 deletions

diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss
index 80ac35edc..07f944ffa 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/fixmystreet/_layout.scss
@@ -981,6 +981,59 @@ body.frontpage {
   }
 }
 
+// Admin tables
+
+$table_border_color:   #ccc;
+$table_heading_bg_col: #595959;
+$table_heading_border_col:   #7a7a7a;
+$table_heading_col:    #fff;
+$table_heading_underline_col: #393939;
+$button_col:    #fff;
+$button_bg_col: #a1a1a1;  // also search bar (tables)
+
+.admin {
+    table {
+        width: 100%;
+        font-size: 0.9em;
+        border: 1px solid $table_border_color;
+        border-collapse: collapse;
+        margin-bottom: 1em;
+        th, td {
+            padding: 0.666em 0.5em;
+            border: 1px solid $table_border_color;
+        }
+        th {
+            color: white;
+            background-color: $table_heading_bg_col;
+            border-bottom: 2px solid $table_heading_underline_col;
+            border-left: 1px solid $table_heading_border_col;
+            border-right: 1px solid $table_heading_border_col;
+            a:link, a:visited {
+                color: white;
+            }
+        }
+        td.record-id {
+            text-align: center;
+            font-weight: bold;
+        }
+        tr.filter-row td {
+            display: none; /* TODO: reveal when filtering is implemented */
+            padding: 4px 4px 4px 40px;
+            background-color: $button_bg_col;
+            background-image: url('search-icon-white.png');
+            background-position: 14px center;
+            background-repeat: no-repeat;
+            border-bottom: 2px solid $table_border_color;
+        }
+        tr.filter-row td input[type=text] {
+            background-color: #e1e1e1;
+            width: 16em;
+            @include border-radius(4px);
+            border: none;
+            padding: 3px 0.5em;
+        }
+    }
+}
 
 
 
diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss
index 542cffd96..a46c15875 100644
--- a/web/cobrands/stevenage/layout.scss
+++ b/web/cobrands/stevenage/layout.scss
@@ -1,5 +1,5 @@
 @import "colours";
-@import "../fixmystreet/layout";
+@import "../fixmystreet/_layout";
 
 // d523b431 - "Stevenage Home page styles"
 // 2a23e09f - Moved menu on map page and reverted to full header.
diff --git a/web/cobrands/zurich/_colours.scss b/web/cobrands/zurich/_colours.scss
index 73fb36577..e2a2587f0 100644
--- a/web/cobrands/zurich/_colours.scss
+++ b/web/cobrands/zurich/_colours.scss
@@ -16,12 +16,3 @@ $col_fixed_label_dark: #4B8304;
 $mobile_menu_tab_bg_col: #FFFFFF; // the white border and tab on mobile site
 $mobile_header_blue: #366AB6; // close match to Zurich logo_portal.jpg
 
-// Zurich admin tables:
-
-$table_border_color:   #ccc;
-$table_heading_bg_col: #595959;
-$table_heading_border_col:   #7a7a7a;
-$table_heading_col:    #fff;
-$table_heading_underline_col: #393939;
-$button_col:    #fff;
-$button_bg_col: #a1a1a1;  // also search bar (tables)
diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss
index 46ea45856..2b16636b9 100644
--- a/web/cobrands/zurich/layout.scss
+++ b/web/cobrands/zurich/layout.scss
@@ -1,5 +1,5 @@
 @import "colours";
-@import "../fixmystreet/layout";
+@import "../fixmystreet/_layout";
 @import "zurich";
 
 // Things to override from parent stylesheet
@@ -286,48 +286,6 @@ body.mappage.admin .content {
     #zurich-footer {
         margin: 2em auto 3em auto;
     }
-
-    table {
-        width: 100%;
-        font-size: 0.9em;
-        border: 1px solid $table_border_color;
-        border-collapse: collapse;
-        margin-bottom: 1em;
-        th, td {
-            padding: 0.666em 0.5em;
-            border: 1px solid $table_border_color;
-        }
-        th {
-            color: white;
-            background-color: $table_heading_bg_col;
-            border-bottom: 2px solid $table_heading_underline_col;
-            border-left: 1px solid $table_heading_border_col;
-            border-right: 1px solid $table_heading_border_col;
-            a:link, a:visited {
-                color: white;
-            }
-        }
-        td.record-id {
-            text-align: center;
-            font-weight: bold;
-        }
-        tr.filter-row td {
-            display: none; /* TODO: reveal when filtering is implemented */
-            padding: 4px 4px 4px 40px;
-            background-color: $button_bg_col;
-            background-image: url('search-icon-white.png');
-            background-position: 14px center;
-            background-repeat: no-repeat;
-            border-bottom: 2px solid $table_border_color;
-        }
-        tr.filter-row td input[type=text] {
-            background-color: #e1e1e1;
-            width: 16em;
-            @include border-radius(4px);
-            border: none;
-            padding: 3px 0.5em;
-        }
-    }
 }
 
 .admin-nav-wrapper {