14 files changed, 141 insertions, 30 deletions
diff --git a/web/i/SEHPlogo-bwS.png b/web/cobrands/emptyhomes/SEHPlogo-bwS.png
index 496d43115..496d43115 100644
--- a/web/i/SEHPlogo-bwS.png
+++ b/web/cobrands/emptyhomes/SEHPlogo-bwS.png
diff --git a/web/i/Sheltercymru47.gif b/web/cobrands/emptyhomes/Sheltercymru47.gif
index b7eb2c4ff..b7eb2c4ff 100644
--- a/web/i/Sheltercymru47.gif
+++ b/web/cobrands/emptyhomes/Sheltercymru47.gif
diff --git a/web/i/Sheltercymru47s.png b/web/cobrands/emptyhomes/Sheltercymru47s.png
index 5547be1e0..5547be1e0 100644
--- a/web/i/Sheltercymru47s.png
+++ b/web/cobrands/emptyhomes/Sheltercymru47s.png
diff --git a/web/cobrands/emptyhomes/c4logo.png b/web/cobrands/emptyhomes/c4logo.png
new file mode 100644
index 000000000..783385e30
--- /dev/null
+++ b/web/cobrands/emptyhomes/c4logo.png
diff --git a/web/cobrands/emptyhomes/css.css b/web/cobrands/emptyhomes/css.css
index ba761814a..97d0e1192 100644
--- a/web/cobrands/emptyhomes/css.css
+++ b/web/cobrands/emptyhomes/css.css
@@ -96,7 +96,7 @@ a:hover, a:active {
 #wrapper {
     clear: both;
     margin: 0 2em 2em;
-    padding-top: 0.5em;
+    padding-top: 2em;
 }
 
 #navigation {
diff --git a/web/i/eha-logo.jpeg b/web/cobrands/emptyhomes/eha-logo.jpeg
index 250be8502..250be8502 100644
--- a/web/i/eha-logo.jpeg
+++ b/web/cobrands/emptyhomes/eha-logo.jpeg
diff --git a/web/i/eha-logo.png b/web/cobrands/emptyhomes/eha-logo.png
index 5cc912521..5cc912521 100644
--- a/web/i/eha-logo.png
+++ b/web/cobrands/emptyhomes/eha-logo.png
diff --git a/web/i/eha.jpg b/web/cobrands/emptyhomes/eha.jpg
index 56e767b86..56e767b86 100644
--- a/web/i/eha.jpg
+++ b/web/cobrands/emptyhomes/eha.jpg
diff --git a/web/i/eha.png b/web/cobrands/emptyhomes/eha.png
index 8c17db486..8c17db486 100644
--- a/web/i/eha.png
+++ b/web/cobrands/emptyhomes/eha.png
diff --git a/web/cobrands/emptyhomes/tiger-aspect.png b/web/cobrands/emptyhomes/tiger-aspect.png
new file mode 100644
index 000000000..53e8d5311
--- /dev/null
+++ b/web/cobrands/emptyhomes/tiger-aspect.png
diff --git a/web/cobrands/oxfordshire/_colours.scss b/web/cobrands/oxfordshire/_colours.scss
index 0179bdbe4..eea046781 100644
--- a/web/cobrands/oxfordshire/_colours.scss
+++ b/web/cobrands/oxfordshire/_colours.scss
@@ -13,4 +13,9 @@ $col_click_map_dark: $primary_text;
 $col_fixed_label: $oxfordshire_lt_green;
 $col_fixed_label_dark: $primary_text;
 
+// Oxfordshire have toasty orange buttons
 
+$oxfordshire_button_base: #F35A0E;
+$oxfordshire_button_top: #EC6816;
+$oxfordshire_button_bottom: #FE4602;
+$oxfordshire_button_border: #CCC;
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index 10e5c5711..d3ba888d9 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -37,4 +37,11 @@
     height: 20px;
     width: 105px;
   }
-}
-\ No newline at end of file
+}
+
+.oxfordshire-preamble {
+    background: #E0E0E0;
+    margin: 0em auto 1em auto;
+    padding: 1em 1em 0.5em 1em;
+}
+
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index 8d5710158..e2192180c 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -6,6 +6,10 @@ body {
   background-image: none;
 }
 
+body, body a {
+  font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; 
+}
+
 #front-main {
   background-color: $primary;
   background-image: none;
@@ -150,5 +154,30 @@ body.twothirdswidthpage .content {
     }
 }
 
+#front-main #postcodeForm div {
+  border: 1px solid #fff; // because orange "Go" button (see below) abuts this border, looks a tiny bit better if it's not dark green
+}
+
+// styled Oxfordshire buttons -- including the "Go" button on the postcode form -- to be orange:
+
+#front-main #postcodeForm div input#sub,
+.green-btn,
+button.green-btn,
+input.green-btn{
+  @include button-reset(
+    $oxfordshire_button_top, $oxfordshire_button_bottom, $oxfordshire_button_border, #fff,
+    $oxfordshire_button_top, $oxfordshire_button_bottom, $oxfordshire_button_border, #fff
+  );
+  text-transform:capitalize;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  font-weight: normal;
+  cursor: pointer;
+}
 
 @import "oxfordshire";
diff --git a/web/cobrands/oxfordshire/oxfordshire.scss b/web/cobrands/oxfordshire/oxfordshire.scss
index 0429a622b..d6b31586c 100644
--- a/web/cobrands/oxfordshire/oxfordshire.scss
+++ b/web/cobrands/oxfordshire/oxfordshire.scss
@@ -9,7 +9,7 @@
 body {
   font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; 
   line-height:18px; 
-  a {text-decoration:none; outline:0; font-family:Arial, Helvetica, sans-serif; font-size:0.75em; color:#0c62ba}
+  a {text-decoration:none; color:#0c62ba}
   a { font-size: 1em; } // mySociety
   a:hover {text-decoration:underline}
   margin:0;
@@ -26,34 +26,43 @@ body {
 
 }
 
-#oxford-header
- {
-    padding:0 16px 7px 16px; 
-    clear:both; 
-    overflow:hidden; 
-    position:relative; 
-    width:958px; 
-    height:84px; 
-    height:auto !important; 
-    min-height:84px; 
-    background: $oxfordshire_lt_green url("/cobrands/oxfordshire/images/header.jpg") no-repeat 0 0;
-
-	 a.logo:hover {cursor:pointer;cursor:hand}
-	 a.logo {float:left; display:inline; margin:3px 0 6px 10px; position:relative; overflow:hidden}
-	 a.logo span {display:block; position:absolute; top:0; left:0; z-index:10}
-	 a.logo,  a.logo span {width:173px; height:38px; background: url("/cobrands/oxfordshire/images/logo.jpg") no-repeat 0 0;}
-
-	 h1 {float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; color:#ffffff; white-space:nowrap;font-family:"Trebuchet MS",Tahoma,Arial,sans-serif;}
-     span.header {float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; color:#ffffff; white-space:nowrap}
-	 a {color:#ffffff;}
-
-	 #oxford-links {
-	  padding: 10px 3px 0px 0px; float:right;color:#ffffff;
-    a{
+#oxford-header {
+  padding:0 16px 7px 16px; 
+  clear:both; 
+  overflow:hidden; 
+  position:relative; 
+  width:958px;
+
+  /* note================= */
+  height: 133px;
+  height:auto !important; 
+  min-height:133px;
+  /* note================= */
+
+  background: $oxfordshire_lt_green url("/cobrands/oxfordshire/images/header.jpg") no-repeat 0 0;
+
+  a.logo:hover {cursor:pointer;cursor:hand}
+  a.logo {float:left; display:inline; margin:3px 0 6px 10px; position:relative; overflow:hidden}
+  a.logo span {display:block; position:absolute; top:0; left:0; z-index:10}
+  a.logo,  a.logo span {width:173px; height:38px; background: url("/cobrands/oxfordshire/images/logo.jpg") no-repeat 0 0;}
+
+  h1 {
+    float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; 
+    font-weight:bold; color:#ffffff; white-space:nowrap;font-family:"Trebuchet MS",Tahoma,Arial,sans-serif;
+  }
+  span.header {
+    float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold;
+    color:#ffffff; white-space:nowrap
+  }
+  a {
+    color:#ffffff;
+  }
+  #oxford-links {
+    padding: 10px 3px 0px 0px; float:right;color:#ffffff;
+    a {
       font-size:0.75em; // mySociety putting this back (switched off in body)
       margin: 0px 5px 0px 5px
     }
-
   }
   .oxford-user {
     float: right;
@@ -142,10 +151,8 @@ body {
     li.last a {border-right:1px solid #666;}
     a {padding:8px 0 0 0;}
   }
-  
 }
 
-
 #oxford-footer {
   float:left; 
   display:inline; 
@@ -182,3 +189,66 @@ body {
   }
 }
 
+ /* ---------------------------------------------------------------------------------
+    oxfordshire nav menubar from e.g., 
+    http://fisd.oxfordshire.gov.uk/kb5/oxfordshire/fsd/includes/css/wireframe/navbar.css
+  ---------------------------------------------------------------------------------*/
+
+#navigation {
+  position: absolute;
+  left: 0;
+  top: 90px;
+  .menubar {
+    width: 972px;
+    padding: 0 0 0 18px;
+    border-top: 1px solid #004300;
+    font-size: 13px; /*  explicit; it was implicit from OCC's styles */
+    color: #999999;
+    overflow: visible;
+    /*width: @gridWidth; only needed for contained menu*/
+    display: inline-block;
+    z-index: 100;
+    .menu-inner {
+      background-color: #004300;
+      background-repeat: repeat-x;
+      -webkit-border-radius: 0;
+      -moz-border-radius: 0;
+      border-radius: 0;
+      box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), 0 -1px 0 rgba(0, 0, 0, 0.1) inset;
+      .menu {
+        left: 0;
+        margin: 0 10px 0 0;
+        padding: 0;
+        position: relative;
+        list-style: none outside none;
+        > li {
+          list-style: none outside none;
+          float: left;
+          > a, > span {
+            color: #ffffff;
+            float: none;
+            line-height: 19px;
+            padding: 10px 10px 11px;
+            text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+            display: block;
+            text-decoration: none;
+            &:hover {
+              color: #FFFFFF;
+            }
+          }
+        }
+      }
+    }
+  }
+  .menubar-fixed-top {
+    left: 0;
+    margin-bottom: 0;
+    position: fixed;
+    right: 0;
+    z-index: 1000;
+  }
+}
+.oxford-left {
+  float: left !important;
+}
+