Merge branch 'csssss'

21 files changed, 33 insertions, 50 deletions

diff --git a/templates/web/angus/footer.html b/templates/web/angus/footer.html
index 84ab05b35..f9e1f3a99 100644
--- a/templates/web/angus/footer.html
+++ b/templates/web/angus/footer.html
@@ -3,7 +3,7 @@
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
+            <div class="container">
                 [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
             </div>
         </div>
diff --git a/templates/web/angus/post_header_extra.html b/templates/web/angus/post_header_extra.html
index 81673aae5..0c30e1a45 100644
--- a/templates/web/angus/post_header_extra.html
+++ b/templates/web/angus/post_header_extra.html
@@ -7,7 +7,7 @@
   </div>
 </div>
 
-<div class="wrapper wrapper__main_menu">
+<div class="clearfix wrapper__main_menu">
   <div class="container">
     [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area ul_class="nav-menu nav-menu--breadcrumb" omit_wrapper=1 %]
   </div>
diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html
index 9f86f7519..e2bdbb01a 100644
--- a/templates/web/base/footer.html
+++ b/templates/web/base/footer.html
@@ -8,7 +8,7 @@
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
+            <div class="container">
                 [% INCLUDE "main_nav.html" %]
             </div>
         </div>
diff --git a/templates/web/bristol/footer.html b/templates/web/bristol/footer.html
index 57814b01a..794dbe457 100644
--- a/templates/web/bristol/footer.html
+++ b/templates/web/bristol/footer.html
@@ -3,7 +3,7 @@
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
+            <div class="container">
                 [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
             </div>
         </div>
diff --git a/templates/web/bristol/header_logo.html b/templates/web/bristol/header_logo.html
index 42633fbf8..fdcabc99e 100644
--- a/templates/web/bristol/header_logo.html
+++ b/templates/web/bristol/header_logo.html
@@ -1,2 +1,2 @@
-  <a href="https://bristol.gov.uk/" id="site-logo">bristol.gov.uk</a>
+  <a href="https://www.bristol.gov.uk/" id="site-logo">bristol.gov.uk</a>
   <a href="/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a>
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html
index b5247bb9e..5ac94ba83 100644
--- a/templates/web/bromley/footer.html
+++ b/templates/web/bromley/footer.html
@@ -8,7 +8,7 @@
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
+            <div class="container">
                 [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 %]
             </div>
         </div>
diff --git a/templates/web/eastherts/footer.html b/templates/web/eastherts/footer.html
index 7a40acd42..bb6d0ed23 100644
--- a/templates/web/eastherts/footer.html
+++ b/templates/web/eastherts/footer.html
@@ -3,7 +3,7 @@
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
+            <div class="container">
                 [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
             </div>
         </div>
diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html
index 097fe82e1..76f52a212 100644
--- a/templates/web/fiksgatami/footer.html
+++ b/templates/web/fiksgatami/footer.html
@@ -8,7 +8,7 @@
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
+            <div class="container">
                 <div id="main-nav" role="navigation">
                     <ul class="nav-menu nav-menu--mysoc">
                         <li><a href="http://www.nuug.no/">Foreningen NUUG</a></li>
diff --git a/templates/web/fiksgatami/nn/footer.html b/templates/web/fiksgatami/nn/footer.html
index 08ec155f5..519a8c3f5 100644
--- a/templates/web/fiksgatami/nn/footer.html
+++ b/templates/web/fiksgatami/nn/footer.html
@@ -8,7 +8,7 @@
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
+            <div class="container">
                 <div id="main-nav" role="navigation">
                     <ul class="nav-menu nav-menu--mysoc">
                         <li><a href="http://www.nuug.no/">Foreininga NUUG</a></li>
diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html
index fc3cf02f0..7fd490129 100644
--- a/templates/web/fixamingata/footer.html
+++ b/templates/web/fixamingata/footer.html
@@ -8,7 +8,7 @@
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
+            <div class="container">
                 <div id="main-nav" role="navigation">
                     <ul class="nav-menu nav-menu--main">
                         <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
diff --git a/templates/web/greenwich/footer.html b/templates/web/greenwich/footer.html
index 0534054cb..7cc4f185c 100644
--- a/templates/web/greenwich/footer.html
+++ b/templates/web/greenwich/footer.html
@@ -8,7 +8,7 @@
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
+            <div class="container">
                 [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name %]
             </div>
         </div>
diff --git a/templates/web/hart/footer.html b/templates/web/hart/footer.html
index d3dd77640..305393023 100644
--- a/templates/web/hart/footer.html
+++ b/templates/web/hart/footer.html
@@ -5,14 +5,12 @@
     </div><!-- .table-cell -->
 
     <div class="nav-wrapper clearfix">
-        <div class="main-menu-wrapper">
-            <div class="main-menu">
-              [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area ul_class="clearfix" hide_privacy_link=1 %]
-            </div>
-        </div>
-        <div class="nav-wrapper-2 clearfix">
-            <div id="main-nav" class="clearfix" role="navigation">
-                <ul class="nav-menu">
+      <div class="container container--hart">
+        [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area ul_class="nav-menu nav-menu--first" hide_privacy_link=1 %]
+      </div>
+      <div class="container">
+            <div id="main-nav--hart" role="navigation">
+                <ul class="nav-menu nav-menu--hart">
                     <li>
                         <a href="http://www.hart.gov.uk/home">Home</a>
                     </li>
diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html
index bc9494b13..db2bbbcdc 100644
--- a/templates/web/oxfordshire/footer.html
+++ b/templates/web/oxfordshire/footer.html
@@ -8,7 +8,7 @@
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
+            <div class="container">
                 <div id="main-nav" role="navigation">
                     [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area omit_wrapper=1 hide_privacy_link=1 %]
                     <ul class="nav-menu">
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index 492a29bb7..3666eb4ff 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -26,10 +26,10 @@
     </head>
     <body class="[% bodyclass | html IF bodyclass %]">
 <div id="oxford-wrapper">
-    <div id="oxford-header" class="desk-only oxford-left">
-        <a href="http://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council<span></span></a>
+    <div id="oxford-header" class="desk-only">
+        <a href="https://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council</a>
         <span id="oxford-links">
-            <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a>
+            <a href="https://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a>
         </span>
         <div style="clear:both"></div>
         <span class="header"><a href="/">Report a road or street problem</a></span>
diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html
index d225f13b8..af264b1ff 100644
--- a/templates/web/stevenage/footer.html
+++ b/templates/web/stevenage/footer.html
@@ -31,7 +31,7 @@
             </div><!-- .container -->
         </div><!-- .table-cell -->
 
-        <div class="nav-wrapper">
+        <div class="table-caption">
 
 
           <header id="stevenage_cc_header" role="banner">
@@ -86,11 +86,11 @@
           </div>
           </header>
 
-
-
-            <div class="nav-wrapper-2">
+          <div class="nav-wrapper">
+            <div class="container">
                 [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 %]
             </div>
+          </div>
         </div>
     </div> <!-- .wrapper -->
 
diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html
index 52eb4f0e8..81c1d9d23 100644
--- a/templates/web/warwickshire/header.html
+++ b/templates/web/warwickshire/header.html
@@ -85,7 +85,7 @@
                                         <li><a href="//www.warwickshire.gov.uk/listsanddata">Lists, data and information</a></li>
                                         <li><a href="//www.warwickshire.gov.uk/organisation" accesskey="2">Organisation</a></li>
                                         <li><a href="//www.warwickshire.gov.uk/performance">Our performance</a></li>
-                                        <li><a href="//www.warwickshire.gov.uk/partnerships">Partnerships</a></li>                   
+                                        <li><a href="//www.warwickshire.gov.uk/partnerships">Partnerships</a></li>
                                         <li><a href="//www.warwickshire.gov.uk/policies">Policies, standards and legislation</a></li>
                                         <li><a href="//www.warwickshire.gov.uk/projects">Projects</a></li>
                                         <li><a href="//www.warwickshire.gov.uk/strategies">Strategies and priorities</a></li>
@@ -146,24 +146,11 @@
                             <a href="//www.warwickshire.gov.uk/"><img src="//www.warwickshire.gov.uk/wp-content/themes/gamma/images/wdwhitelogo.png" alt="Warwickshire County Council - home" title="Warwickshire County Council - home" ></a>
                         </div>
                         <div class="span9">
-                            <div class="row">
-                                <div class="span9">
-                                    <form action="//search3.openobjects.com/kb5/warwickshire/search/results.page" method="get" name="kbs" class="navbar-form pull-right" id="site-search">
-                                        <label for="qtbottom" class="skip" style="display:none;">Search again</label>
-                                        <input class="span3" type="text" maxlength="1000" size="40" name="qt" id="qtbottom" alt="Search" placeholder="eg; libraries, roadworks" accesskey="4">
-                                        <button type="submit" value="Search" id="kbsubmitbottom" class="btn btn-mini searchbutton">Search</button>
-                                    </form>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div id="site-tabs" class="span9">
-                                    <ul class="nav nav-tabs">
-                                        <li class="tab"><a href="//www.warwickshire.gov.uk/">Residents</a></li>
-                                        <li class="tab"><a href="//www.warwickshire.gov.uk/business">Businesses</a></li>
-                                        <li class="tab"><a href="//www.warwickshire.gov.uk/corporate">About the council</a></li>
-                                    </ul>
-                                </div>
-                            </div>
+                            <form action="//search3.openobjects.com/kb5/warwickshire/search/results.page" method="get" name="kbs" class="navbar-form pull-right" id="site-search">
+                                <label for="qtbottom" class="skip" style="display:none;">Search again</label>
+                                <input type="text" maxlength="1000" size="40" name="qt" id="qtbottom" alt="Search" placeholder="eg; libraries, roadworks" accesskey="4">
+                                <button type="submit" value="Search" id="kbsubmitbottom" class="btn btn-mini searchbutton">Search</button>
+                            </form>
                         </div>
                     </div>
                 </div>
diff --git a/templates/web/whitelabel/footer_extra.html b/templates/web/whitelabel/footer_extra.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/whitelabel/footer_extra.html
diff --git a/templates/web/whitelabel/front/footer-marketing.html b/templates/web/whitelabel/front/footer-marketing.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/whitelabel/front/footer-marketing.html
diff --git a/templates/web/whitelabel/next_steps.html b/templates/web/whitelabel/next_steps.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/whitelabel/next_steps.html
diff --git a/templates/web/zurich/footer.html b/templates/web/zurich/footer.html
index d299284d6..0164dbcab 100644
--- a/templates/web/zurich/footer.html
+++ b/templates/web/zurich/footer.html
@@ -4,8 +4,7 @@
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
-                <div class="nav-wrapper-3">
+            <div class="container">
                     <div id="main-nav" role="navigation">
                       [% IF c.user_exists %]
                         <p>
@@ -23,7 +22,6 @@
                             %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
                         </ul>
                     </div>
-                </div>
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index 303d861a4..0ab051aa7 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -27,7 +27,7 @@
     <body class="[% bodyclass | html IF bodyclass %]">
 
     <div class="wrapper">
-        <div class="table-cell">
+        <div class="table-cell clearfix">
             <header id="site-header" role="banner">
                 <div class="container">
                     <a href="/" id="site-logo-text">Züri wie neu</a>