aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2015-04-24 10:05:51 +0100
committerMatthew Somerville <matthew@mysociety.org>2015-04-24 10:05:51 +0100
commit4d6cd5f040b8a8f28131bccdedd3545f57915e7c (patch)
tree675f373d2809a096623385ca266ed43b5b14af6a
parent45b91fb892f1d9e6bf1d5a4044feb174f72bf93f (diff)
parentef7ea9b4056d3664af305c8a777e651271deeb32 (diff)
Merge remote-tracking branch 'origin/issues/931-mobile-report-in-header'
-rw-r--r--templates/web/fixmystreet/header_logo.html1
-rw-r--r--web/cobrands/barnet/base.scss10
-rw-r--r--web/cobrands/bromley/base.scss6
-rw-r--r--web/cobrands/eastsussex/base.scss11
-rw-r--r--web/cobrands/fixamingata/base.scss17
-rw-r--r--web/cobrands/fixmindelo/base.scss4
-rw-r--r--web/cobrands/fixmystreet/base.scss4
-rw-r--r--web/cobrands/fixmystreet/images/menu-black.pngbin0 -> 109 bytes
-rw-r--r--web/cobrands/fixmystreet/images/menu-black.svg15
-rw-r--r--web/cobrands/fixmystreet/images/menu-white.pngbin0 -> 108 bytes
-rw-r--r--web/cobrands/fixmystreet/images/menu-white.svg15
-rw-r--r--web/cobrands/harrogate/base.scss15
-rw-r--r--web/cobrands/oxfordshire/base.scss12
-rw-r--r--web/cobrands/sass/_base.scss35
-rw-r--r--web/cobrands/sass/_layout.scss7
-rw-r--r--web/cobrands/trinidadtobago/base.scss12
-rw-r--r--web/cobrands/zurich/base.scss10
17 files changed, 128 insertions, 46 deletions
diff --git a/templates/web/fixmystreet/header_logo.html b/templates/web/fixmystreet/header_logo.html
index 6e4ad9e21..3ae706730 100644
--- a/templates/web/fixmystreet/header_logo.html
+++ b/templates/web/fixmystreet/header_logo.html
@@ -1 +1,2 @@
<a href="/" id="site-logo">[%- PROCESS 'site-name.html' -%]</a>
+ <a href="/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a>
diff --git a/web/cobrands/barnet/base.scss b/web/cobrands/barnet/base.scss
index bc1642e22..aff4a1e6c 100644
--- a/web/cobrands/barnet/base.scss
+++ b/web/cobrands/barnet/base.scss
@@ -18,12 +18,14 @@
background-color: white;
}
#site-logo {
- width: 235px;
- background: url('/cobrands/barnet/img/barnet-logo.gif') -3px -3px no-repeat;
+ width: 240px;
+ background: url('/cobrands/barnet/img/barnet-logo.gif') 0 0 no-repeat;
+ top: 0.6em;
+ left: 0.5em;
}
#nav-link {
- right: 1em;
- background: url('/cobrands/barnet/img/barnet-skipnav.png') no-repeat;
+ background-image: url(/cobrands/fixmystreet/images/menu-black.png);
+ background-image: url(/cobrands/fixmystreet/images/menu-black.svg), none;
}
#front-main #postcodeForm div input#sub,
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss
index 7975197ff..9b1e787df 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -26,9 +26,9 @@ h1.main {
// Colour tab to match colour scheme
#nav-link {
- width: 50px;
- height: 48px;
- background: url('/cobrands/bromley/tab-blue.png') 0 0 no-repeat;
+ height: 4em; // to match #site-header
+ background-image: url(/cobrands/fixmystreet/images/menu-black.png);
+ background-image: url(/cobrands/fixmystreet/images/menu-black.svg), none;
}
// Change logo to logo of council
diff --git a/web/cobrands/eastsussex/base.scss b/web/cobrands/eastsussex/base.scss
index 7e9c57b06..5a6b5295f 100644
--- a/web/cobrands/eastsussex/base.scss
+++ b/web/cobrands/eastsussex/base.scss
@@ -69,6 +69,17 @@ h1.main {
height: 48px;
}
+#report-cta {
+ top: 24px; // height of header
+ margin-top: -0.7em;
+ font-size: 1em;
+ border-color: mix(#fff, $primary, 20%);
+
+ &:hover, &:focus {
+ background-color: mix(#fff, $primary, 10%);
+ }
+}
+
#breadcrumb_breadcrumbTrail ol li {
list-style: none;
}
diff --git a/web/cobrands/fixamingata/base.scss b/web/cobrands/fixamingata/base.scss
index a132decd7..01aa46c71 100644
--- a/web/cobrands/fixamingata/base.scss
+++ b/web/cobrands/fixamingata/base.scss
@@ -23,6 +23,23 @@ $image-sprite: '/cobrands/fixamingata/images/sprite.png';
margin-left: 10px;
background: url('/cobrands/fixamingata/images/fms-logo.png') no-repeat;
}
+#nav-link {
+ background-image: url(/cobrands/fixmystreet/images/menu-black.png);
+ background-image: url(/cobrands/fixmystreet/images/menu-black.svg), none;
+}
+
+#report-cta {
+ font-size: 0.8em;
+ margin-top: -0.25em;
+ border-color: #999;
+ color: #000;
+ padding-bottom: 0.2em;
+ padding-top: 0.5em;
+
+ &:hover, &:focus {
+ background-color: #bbb;
+ }
+}
#front-main {
a#geolocate_link {
diff --git a/web/cobrands/fixmindelo/base.scss b/web/cobrands/fixmindelo/base.scss
index 4d3a53f0a..486c66672 100644
--- a/web/cobrands/fixmindelo/base.scss
+++ b/web/cobrands/fixmindelo/base.scss
@@ -28,6 +28,10 @@ $image-sprite: 'images/sprite.png';
background: url('images/sprite.png') -8px -915px no-repeat;
}
+#report-cta {
+ display: none;
+}
+
#footer-help ul li {
padding-right: 3em;
a {
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 5dfe8958d..3baac2eb0 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -21,10 +21,6 @@
#message_close { float: right; }
}
-#nav-link {
- background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAwCAMAAABkKdmIAAAACW9GRnMAAAAFAAADlACdjNY6AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAABEVBMVEUAAAAiIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsJAAAAABPQAAAAAAlHgBnVAAAAACSdwAAAAAAAAAaFQAAAAAAAAAAAAAAAACRdgCqigAAAAAAAABHOgDCnwAAAACriwCAaAApIQDOqABIOwCgggBqVwB8ZQDVrgCwkADjuQCafgDftgDetQCqigDrwADHogDGoQDFoAD1yADzxgDyxQDwxAD/0AD///+ZbHkYAAAAWXRSTlMAAAECAwQFBgkLDA0OEBESExQVFxgeHyEkJSkqMTI2Oj0/Q0RHSEpOT1FSVVtmZmxsdX6Kj5ebnp+goaenqKmru7y9vsTY3uPk5OTl5+zs7e7x9PX3+Pr7/fI8qpUAAAABYktHRFoDu6WiAAABMklEQVRIx+3T2VLCMBSA4ZjU1hhpUKgWlaq0VSuutYg7IJuIogKKvv+LSM2AelNOuHCGGf77b7KcBKGwT2AzYej/CIYSPCBEhRKVCILVBJQkVCwIS0NJmglCYhkoycSIINyBEocPiAsl7ljkeypTMhHko9tpD+t0QavUSjcX+bDzy9vSPYj0zg523LDtvaNCD3aWh11ziXMeT64fP0OPX1xbmCVEXdyqwm/sNEWJMr96LXHJb4fLczR1IjWXx83kyv6r3CiLG05VdvpXd9IP5n36XyaStGCiNSS6XYaRsq0LgpnlNyGi6VsMC6IZXlAfLeqBZ2iCIELNbFBpvLQjempUgqxJxb76KdT0/Fw+spzvmVRB6McYlu24ETm2ZfwW/b1pTOeR6Uwj6E8YkxFhjMbuC8zPYpEN6mT7AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwHHW0eAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMG0oDMQAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAAElFTkSuQmCC') no-repeat;
-}
-
#site-logo {
background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAK8AAAAoCAYAAACIJ6oVAAAACW9GRnMAAAADAAAAAwB3k5ejAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAABmJLR0QA/wD/AP+gvaeTAAAag0lEQVR42u1cB1RWx7YeBBW7YAOViL0bNSomdsWADVsQbEHFiAUUMYmiokEUWzQiiQ0VNSC2gFiJmthbiF1jwxaNGr0pKra8t1be3r/frLc99/zwo7nv3rzFWWuv/z9zZs6ZM/PtPd/eM3OUyj1yj9wj98g9co/cI/fIPXKP3MPaYQfJY6Po/LlH7vFvBa09ST6SIiROJM7ZiBPy5kPZXBDnHv8W0OYHGCuSeJB4kniReFsRL+TxQBkngDhPbpPmHv8XRx4AjoFXiaQFSUDXrl2XxMfHp585c+b2nyZHZmbmM742b968gx4eHvO5DElzkgokhXKtcO7xrz7sAbQKAF7AoEGDEk+ePPnznzk8tm3bdhUg7kFSE5QiJ1bY7jXkrxyB/pX5/4o2yD0EcKuQdHdzc5t14MCBm3++5rFy5cqjdL9AKMMbJAWzAbB0DLlODlmIPeSvdBrNnFNr97LmyL4OsOQ97bNoA/nuf1eA/yX1zCOA69uxY8eEhw8f/mEGxrt37z5OS0vLWLZs2QmS4yzr168/d/Xq1V+sAfjKlSu/kjLMpHv7AMD5TCprJ7h2XvDtAqgXS2EhOq0g8jgiv5Z8ooNtbRj5fAfcI5+VexkBlhf5XvXZRsXVz3fEOxrbQL+7I/LlNVFio2Lb/YeBNqt62uXkRvlAFboDuP9lQgOudenSZRmsqI+Js+bj6en58erVq/cT/31uLH/p0qUHAHALUAj7LJzEQuDcpUlcScqRlBfC52VJypCUElEOluIkRdG5OYl4GJ9fVNyrENKlpcsD0DgiulIczy+G/DmNtkjFLYj7lCRxsfL+Lnh3JwC6gEGBHYVS531FZfpXWVppoMzqabOy2aMBmjNHNVrcCxcuPPL29l4D0LYkqQzQlICUhJSB5W5ZtWrV4KNHj14xs8C4T010cB4rIbkycBbrkLyF6EVTIU1IGpHUJ6lFUg31qowoR3nUqbCNIJLALQqleQP3egPnRXHdwQAyZ4CpEp5fAfmLCMDb2QjcfKgzg9Id79YQ7/82yTv49UC71EWblxdALo46lUT/FLeifLZSjFelIXZZjFTaQBQX+HFGGxdA22YLYDvciBs+4NSpUy85ZhcvXnxUtmzZhXTNTzhdjrh5ATxMx3eLocNKIK9fbGzsXiOAU1JSTsKJqyDogx1AUQgdX33RRDX84EqV8G2cWrdzkfpqx0KVzML/dy5WX1H6+n3LVdKsUPUR5W/DFn3BeBV8ap2KS5hmUZBK6NBC2TSGUXHY0tc4s0EtObFWLW3R0HLvGkgvIqhBQbwrP6dB0gwVfixJLY+brIYivwuAmF1H2IkITxGU4/LvvPnmm73IZ1hAo9axe/fu3dBtyP8vX76cnpSUFPPWW291pbyNAXStwNXQBzWggC7oH0dh3ewNw7Y138HeRPKYgNnOCl+3N3B3R9TFBW3H9ayNOruhTQvZAmBtdVtOnz59i9HiAri+JFVFRxhjv+1I2nIHwmLqYZTL+JoBGFGI5riPvei8orB0jffHq9V/nlR/2iLV3dUQKtNrz1K1ls/TE9UKWGU3aLcjGi6PlUbOJxWHFUHfmxUEI051XC8M4DrBOjauV035PU9XmSJ/M1jEElByBxM+Z2diccsAhG0GDx4c/vTp0yfZOcTPnj17PGnSpEjE2LmeLVJTU2fytT/++OPR2rVrxwIc5dAWBcVQbSb5BdfXfkdBIVnxbAcDHSggRPP34qhL7QEDBrz3+PHju1xXUsY0KGEVWOKCot2scl0GYYDkqcx5GzZsuAoWVwL3pTAaNfCqmJiY/dOmTdtepUqVkRjGCgsrymX9jBSCoxiIA1cUw1l+vJgltuzdTI0a5quWaBD17ahS+3dWyQFd1PoAH7V2YFeV9Mte9RtfG9lbxVKZYUsi1PKbX6sf1sxU8zDEVhVDfgHhTDkYnKLCAFpF0BJf/dzf96t/QIGbAqzOqCdb4noknbZ+rjbr/Fti1Rb4BA0wnBcXzzZyZiNVYOvTysvLa/QTOnIS1RkzZswcKtufhQGt02/dunUOxqUOlLm0GKpL4rlaSor3K442KQUr6WrCsx0NQC8oRuNSUMYy4t6l0CZcl3a7du3aIN/Bx8cnCLSokhjlTWlXHjyo6cyZM1PlTRYvXnxWcFMJXEsYjfNLsGdkZPzm7u4+AR1WWHQM/6/JjpzRiYP19YCV1p1YHABi5ehHMlGDgv4vImFQstMXTTLtYqq6xtdG+CkeIUJJRpAMIunJIEAjVUCjlxDOV0HhlDmjgSvAWncK7afmScv+ebj6ktOhnOVxvyp6AufXfS+UiOXgCnUcINLWuhyeXUTwOQfh7GmOXVkrzqFDh743gvO77777nQzFtfnz51/ZvXv3P8Xdjx07dpHKch9EyHTqmwy0ZRu8n6YTtdA+daGEdZFWHe9WFXnrgXc3wm8dXC8HQBaDOKNdKkAJ6+J59fFfP/dNKFP/DRs27JJ1DQkJ+ZzxBT5fDm2W18z62kMTOh0+fPiatLrly5efi8Z3FhaKh/NuNCQdN/Dih+XKlfuCrnVFHkcxdORHx7XcsmXLd7Icz8RhKtlJOEBFAI5GAOAYAd5Z3DEkYSRs5UcBsKMgnBZM8gFGjHehHPXQcFVQP1eA1RXnVdBpDdDB/Yf0VMv5mZmH1XP+ZQtP6e8DrDVQhvN3mT/2Bb3ReS9sVDcofTjA7mHo7BIiMqCpRzncsyksdsiNGzfuybaaM2fObUrn9tpFso1kO1naMzIP9eF1Sud+WCTTf/jhBx7lPibpizq9O3r06BHdu3dn49SN/Y8uXboMjYyMjECaN/qlPeevXbt2/wkTJkSNHz9+6sSJE6d07dr1A1xvjHatiBGpGoDavH79+j2nTJkykekMCyxqJ1CbzlDu8BUrVqTLugYEBKxD27VHm5REW9mbOWqs7YPkDQhk12F1KyNPHoCqyZAhQ5YbeHEm8eI4QS+KoHNc8ELa4lRh6yvL8lQyGspZEPoCsEK1AL4PBHiZuzG37Q1g98RzuSEGX9umLl3dqi6nr1aH331bjYFT6H1vtzpJVOJAYrTFKjUBmGvDAniwk8V5yNFLpvP3GDxMS/iZqTHq1t1v1GP+/8lQtRwK2hSWgYH+/i+wultj1XX+/SFFMVj4+X1C+6pgvvf5FLUWHasjNU5oG1aeeuMDVeC5ZPXt9e2KrecUo1Ul0Nyi9H0kTEk2QFK++OKLi3rka9u27ba4uLhT1mjF7du3f2Jg7N279xudRqBMSEtLO2Ri/UIqVqw4jhTie7N7Xbt27RJhYSzA2Bwc35OBfvz48QNWYv0Z/v7+bIBC33777bnEdZ+Z5SO29DQiIiISylFeWN+XwMuJHrxmwVD5HdCSUoKjcWN7Hjly5KoB6GxlhsG6FMMQyB3Uvm7dur0BwqLoMJ+ff/75kVwLIcCrCb/kvdwofQV4QxgQJB0x7LSBBejC6XKY3xRjsU4DjenEoT/Eu/FzO++Gg8fCXBlKGx7zsdrPafR7Lay/Osv/iaKwUg+G5eBO8x3ZR8XytZ+/VY/oPJn/39+jHtD/8axo4YFqmr7/jkUW2uMhvGp3KJDn5c0qXbxnjNl0/DfffHM/Ojr6LLXrJsqTSLKahEOYrBjsJGY7jc90S57L/tDH8uXLvyfOvd4auCTIevfuPR2+S0CbNm0mZOdg8j3p3mup3Las8q2hg+7ZGlgqjpH/Jb5rAWTfvn1TDaQ5DtalqAAVA8ybAWcSt+0HE18WYPWdPXt2CvG2Y2JCgs1/B+OiHhPwaurgho7uJTo1FEO3D0DbCuIFCxw8O+wFgDZ8qr4BleCw1fBdi9VeTv9tv/oFvHhonw7UkZT29Kh60ruDmg6rzkNWRPwU9T3Ay4DdTdY3E+BfAgBzPYZf2vSCc48frA7R+TpR14mgMcNH9VHzOe3BQXUfitZU8MG27Jjy9SdH1dNypVUMpS0MDw8/klXn3r17N5PXjgwdOnQv5Wc+vpLF19f3W+K+L810Mg08ceLEPZ4JpTyLs7rvo0eP/qhVq9aeS5cuPZTp5PQ9Jyucyb8y/dy5czwicNtFG6kO5X1Gxu4R0ZYnxsmqUqVK7SJl/IfxfkxB2UBWqlTpI1CHqsBpfiN4LYAkLdhqANRwkHZHEX8tExwcHGpFm9nK9AJ/GkpcZ6fgWu2FV+vNDZgFePWzCoMHNpZeP1mnK0wN2ELe3qXOkLU7xUMy7sHgHTm4u1rFedfMVNypH4EDM4gnEhe1DOuJ09UBOp9B97nL53GTLVZ6NMDLYJ+wYor6jq9FjVAXmGdGh6gzfL47TrEjO4mt8wc91ApOozo8BHhWCfBGCD4+lhy6Xzn9owEW3t4FSsejhy+PEnxtzzJ1hs4/ZctLsiwxMTHDligDWc9MomSpXAZA3iyvp6en/waawbQn3lj+/Pnzj4lrniOjdYKu7xk1atRlQ2TomZOTE1M8ph03k5KSXrLWrVu33kUU4qBMO3v2LJfhUZkxcHP16tUvlSHacJrSj82aNeu+TO/Wrdt3lB6LfmiTleW1Bbw6YlCLONV4s8a7fPny79u3b88g/nRw+vTppw2TEZ5iFs57xIgRu3II3l7ZxXhxDw5lhQQCvEkzLPyQKUIQGiK8UW21+PER9Yyvpy1Qly38NNnSuJPxzv0wBH6Ynqgy+HqPdhagby7trLZoh6xBDZVAaZ+TNb/A58sjFY8wbJEXE2e9z2lvuKhpAC5TnbEzQ9VGTj+9wQLQQeDWrPBBGtidW6p4Op9KEgUQx/fo0eMQ04XsAMyRnPbt26dwGZL1higEh/o47LmAJM5YFqBlLr2RncHk5OS78vrmzZufR0VFPWGZOnXqk4SEhKfyOjlkNzZs2HDfUOYZ5X3M+Vm+/PLLpyYO6AkC70vWumfPnvvZsMCPaYoR+J84r1Xa4OHhEYuCxcRkgx87ZmZrHqwd48aNW4uhX8/RdyAivs8G8BYCBWkkLS/9j4Q11U6bDyy7J8Irwwf3UCuF5R2l4574P2POGHVU34/B2LCmZTIjHKDtBiUI5ogB5+n1rtoJbpm0eOIL7rv1c3WtbhW1Rd/DtaQFMBz2m8fOGqcHvWexgiOhOKPdXNT0J0fUU77WvIFlmGXqEhwx5IWy/UijADtqJOPwjmy5OeLD9UvhYXbAgAFn4uPjf6LDlIsePHjwBqxvgkwnHnwPwGWFiDUZOdkqL0UoMsFIO7I7ZsyY8Ss9O0cxaQIvW/H0Tz/99I5M79Wr1y5Qru5wrMsgKmNvk8M2cuTINPDI8rDAvjzTxjNutlbu9OnTd8ELK+LhFodt3bp1P2ThsJmBt6ch2sBg8IfT1RoTEc1wPuSDnjQsUt61s9QeWNNeiEow4KM8PdQmfT/msRiixiCfFxTiA81l+3VSKTr85FJCJT06pJ6T/EFD/U1QjpMY5hmQM86nqB85fUhPC6BDYGXZoR2/ef4Lpwy0hYE65ViSushp00daLN8ETTWaNWs2kxc4YaIoHg7aWljHHdWrVz9u5JIAIoN3hUw7deoU98VnHBdnhTApswD14RFoHoM9J0D8+OOPf2NqkZMykydPvkrP2j937txbMt3f3387RswOwF4JEfHKPlTGAINlY1D4M3B5jYOtFeOlke7u7hGYKXECeDnOGZiRkfG7lVCZGXg5IN5NgDcIw20bALsO4oz1YX0H6fgswDsM+bshijDl6lb1C19/SADk35VR6qgBvMxHA/VQjg7/BMP5fLrveWm5yeouxzUG3ifMW/nauEGWKEAwrD5b9dAmddQXfI2pCysD0w9xPgWdFtKiRYso2Z59+vTZzJQEws9bzzy8Y8eOF02A+E+8FuCdBwX7zKTMVCgajwafkOF5yRrSkK8pQCZ+Lf+jo6MfBgUFsRN6hSzvU0OZ56JM5rRp0zj/A+a4zKlpJGGHOi0mJua6LMdRCPSHF6IyzmbgtTpJwR4nhugxrq6uy2y1uBwGWbNmzV6yCkMBXBfEbS2TFLycMotJCiN4XTEJ4CPA2xtOTj1YdL1MsBomVAJouF4qwDsCjhxTgSCmEnzt+Br1j5qV1F62onze09NiOd8XtCFIPPMjPcTzcEY0I15f+2qOhb9OR2NbuO3qGS9CbKAtwXj+e1CeieeS1S2+Hh6ojiyJeAH01HmWGTkdnQg2zjoxn61fv34SLORCOGXbiGteN+aD5V1mQhsWA8ALTcA7DgrGijaGOO9LsWIC3iM4axxZuEWO2E9jx479NTw8nO/LjteJuLi4+4YyPKrdRpmbVOZHzk+08UcGLRRwQ2xsbIbB8qahPp0RuSopfC/bpod59oa0Ywd5opnWwMr8t1+/filhYWFzQkJCRoF/yo2XeoEOW8dAXg+cxfSwnQl4LVO1AkjdkF+vFtNz7+5Qlr5Dfckh+V/wcARhAIufl5oFa/msThW1lWOys0LVMU67tUPdAfgGIgw2WjxT0xRfXP+IhvjNidHqYNN6lqF4JIDPMlIriADve6A0DOLRYf1VKl/fu0zdvoPJD3YkoQD87KE8cWDmkPEGgKVLl57kqXuz6WFymq+Cty42hr849IaIRKIJeEdj5OFJnaCBAwcmGfOQI/5b48aNf/Lz87vLkQSdHhkZeZnK7CSak25WpnLlyjepzB1ZhrB2AkoWv3DhwvPGrWODBw9eWbNmzYGYCHIFHhyyXJjDIRd9kwcPHvy3fKAZcDt06JCITqklZo2KiEXFhbWzxyDPYmGO2bJIF1hYbwGkjrDG5eAE6kUgOjLhN9xPLcJs11FwZLaaI27vVD9x+vyxlijEIkQHFmlLuG62+panUJvVVzPIKiZx2u1dFqsRAP7VGjN+vrCiQbjWA9d55m3wp2HqK1j3C6P6Wix6Tyh1Z0xbR/OEhn6nQ6ssceRIMaXNEY8xHGbMCYdkgMI68+Kcz+7du2c6WrZq1Wq3CXiHgy55QVF5Zu26Lc/FGhgOE65OSEi4aksZcjq/Rz1jrM0IkqJuxCSVO/o4b46WRNoAXLlU0sGwLE4D1+LsGaMU7CQalkQqAd6CmCLmKdx2ArztkFZGLK4uhHOeqeqqJwREmbCNn6k0/n8pVV0Dt5wEbz6SeaiOAnRppZbqYZ+Fp5phkVpAkd6E5W+NurTCeSP89wv2f8FrxfN7gKO3BzAj5n6oDuvroX0tjloYLHR7WGm2Op8QfThrS3/cuXPncfv27ZOxWIlj7pM2btx43Cxvy5Yt93F+fX7z5s07GJ084fwygAe5ubnNJh77Y3a+TaNGjZYitMfPXrB169ZrWZUhpXrYpEmTzxHhmUQOabzZrhu6z2a0sekkhU2L0c2A6+XltQ4aWh2W1sGwQt5ZL0Y3c/asLEaXi8IdQQe44m8f+VKtYgE1qCrWyOYTnLo6+PD7q6aq5OS5ageDlukATwIQr9zu722ZIBgq+B0P06ETBqsEGub3MB0Y1E0lcoyYZ+j6d7YAvROsvd6dUQHOZzWxa6MygM0dP2DlVJWS8pn6evsXKhUWWYPdYtW83nkxJY3JjSkAT1sMk01gyblukQ0aNEhYsmTJaZ4h41k1uYpv//79t4hiHECYbiIc1AGIrIyLior6+tChQze4T3mkGzZsGFOZhHbt2m2h9Ovp6emXaUifjb7wELtWvDESRJGzuIWfw7F8rSh8v8mTJ+/mDbqgTYNQX6Y+M8jp2sIgNpYhH+cAlZmB0VDXM5wNIQcJOA878VT2KO/EQZtkCd5stwFJKsGai0o2Ewu9C8O0l0JHsvMUyFuHbt++/dTGbUByR0F+0AI3TKN6QOoirZjYjqMXsLshOuENkASAh/bDaqo+GCk6wRK2BA14D40fgvf6EJZwCIb8ZmJNcHE828mwZ64UQNwI1KYPnu2H83aoF9dlPCnVCQZv7DiLUxkm1v7qXRD1Ubf3cT0SK+rmCJmNSMh4gMEfz2gL8PfGO0UgX7SYAIkUDqI/Ro2aYtuTfP4YKNhsPHcWyoehjTujPdviPQaiDbMq0wWWXrfVSNQzCr8jhEJVQJvne60NmGvWrHmAEEckXlqvKHoLvwyMQBoWFhidMxs3YCpBOwrC03wD4KmK/3qFfV6xraQA7ueul+QBMJ5il0crWO76WIdRFZZGfwXIB0D2FTz2HXSq3v5j3KGcXyxkL4nRqyEsrTc6pyM6mOnHcDcXNVPP8vF/dHZLWHO9SLw8/Agdv9bKOAiKHwjL1QdOrCcsdm28W13UXc889jUosb9Q5OZil4Xek2jt+QOFUuqy9TAKVcPo0wLva61MC7HvsB7q2QH16YN8nZFeQ1BEh9fe+s7Wd9OmTTd5Kphn5tgzDQoKWsa/c+fOPbxv376fXmPru3E/WSGAsjTE2bArVy7mkRshK4NG1IBUB1h1eK0UOkkvQK8uFly/BStYB2B0Mdl4adzbpeuqlzjWBpjadG+rAu/vUdenBatFHMb7MU39LNYxhGEmqQHi2kXFAvnSOdiAWRWAKy12PbiLGHgjOLSN8V+/Y23xjsXENh+z5zcRG18bIr2iWORfAv8r2lCmrNgVbqxnQyttb/93+uiIvdhpIPdO5TX5foJxC7qTYVdzCbG1pbDYU6WBUkI0ptlWl+x23UoFchKWq/mCCS9WrklhAL/hahkiB8BKVzVsbM33Clvfi4hvWBRC2RJi0X1Zw/uVMXnHvIKKGZ9fVnxuwEXsoCgk9r4VsqFMcbEH0KyeLugLY9vbvA3+3/25JzvDxzekmH2Uwvjxj/xWNhbmEx1kb9jDVkA0aEHxDQRbvndgBLDeC8cWx4ccv8iv5qidHPudGWpx4sLh4HTEUOtq2GWc04+O5M/Be0kpYPKthOyeb/zYiYNhZ7AtZfKa7CEskEW9cvStif+UD+3l5NNFdla+wmKfxRdZrH1S6VW+NGPcvu6K4a8N+O4QTFoMA//sgOG7AqxRfisjyqt+7slaG2TXJsqG59v6XFvK2NJXr/Rlk7/rJ07tXhH4r/uNLxnqc9JbfOCQdRA7MHTcuAJGI7013i6Hdcuujn/FRwn/6ue+rpF6pQ7J/bi07dZXR0D05soqcI7qiA2LLmJLvIP6z/uW2P+7jsn9rL/tAJYOpLP4LoLx80u5wLXx+B+cTUKEm3GYQAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMBx1tHgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDBtKAzEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAABJRU5ErkJggg==') no-repeat;
}
diff --git a/web/cobrands/fixmystreet/images/menu-black.png b/web/cobrands/fixmystreet/images/menu-black.png
new file mode 100644
index 000000000..72a4806c0
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/menu-black.png
Binary files differ
diff --git a/web/cobrands/fixmystreet/images/menu-black.svg b/web/cobrands/fixmystreet/images/menu-black.svg
new file mode 100644
index 000000000..4bf0d5b07
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/menu-black.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="22px" height="18px" viewBox="0 0 22 18" enable-background="new 0 0 22 18" xml:space="preserve">
+<g>
+ <g>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#000000" d="M2.008,4.017h17.958c1.108,0,2.008-0.899,2.008-2.009
+ C21.974,0.899,21.074,0,19.966,0H2.008C0.899,0,0,0.899,0,2.008C0,3.117,0.899,4.017,2.008,4.017z M19.966,6.982H2.008
+ C0.899,6.982,0,7.881,0,8.99s0.899,2.009,2.008,2.009h17.958c1.108,0,2.008-0.9,2.008-2.009S21.074,6.982,19.966,6.982z
+ M19.966,13.964H2.008C0.899,13.964,0,14.862,0,15.972c0,1.108,0.899,2.009,2.008,2.009h17.958c1.108,0,2.008-0.9,2.008-2.009
+ C21.974,14.862,21.074,13.964,19.966,13.964z"/>
+ </g>
+</g>
+</svg>
diff --git a/web/cobrands/fixmystreet/images/menu-white.png b/web/cobrands/fixmystreet/images/menu-white.png
new file mode 100644
index 000000000..d503ff7a6
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/menu-white.png
Binary files differ
diff --git a/web/cobrands/fixmystreet/images/menu-white.svg b/web/cobrands/fixmystreet/images/menu-white.svg
new file mode 100644
index 000000000..69e09cef3
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/menu-white.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="22px" height="18px" viewBox="0 0 22 18" enable-background="new 0 0 22 18" xml:space="preserve">
+<g>
+ <g>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M2.008,4.017h17.958c1.108,0,2.008-0.899,2.008-2.009
+ C21.974,0.899,21.074,0,19.966,0H2.008C0.899,0,0,0.899,0,2.008C0,3.117,0.899,4.017,2.008,4.017z M19.966,6.982H2.008
+ C0.899,6.982,0,7.881,0,8.99s0.899,2.009,2.008,2.009h17.958c1.108,0,2.008-0.9,2.008-2.009S21.074,6.982,19.966,6.982z
+ M19.966,13.964H2.008C0.899,13.964,0,14.862,0,15.972c0,1.108,0.899,2.009,2.008,2.009h17.958c1.108,0,2.008-0.9,2.008-2.009
+ C21.974,14.862,21.074,13.964,19.966,13.964z"/>
+ </g>
+</g>
+</svg>
diff --git a/web/cobrands/harrogate/base.scss b/web/cobrands/harrogate/base.scss
index 318ee33ee..f0bb1daa1 100644
--- a/web/cobrands/harrogate/base.scss
+++ b/web/cobrands/harrogate/base.scss
@@ -5,7 +5,6 @@
@import "../sass/base";
-
body.frontpage #site-logo,
.ie6 body.frontpage #site-logo,
#site-logo
@@ -20,6 +19,20 @@ body.frontpage #site-logo,
height: 37px;
}
+#nav-link {
+ background-image: url(/cobrands/fixmystreet/images/menu-black.png);
+ background-image: url(/cobrands/fixmystreet/images/menu-black.svg), none;
+}
+
+#report-cta {
+ border-color: #ddd;
+ color: #000;
+
+ &:hover, &:focus {
+ background-color: #eee;
+ }
+}
+
#main-nav ul#main-menu li {
// blue button background, darker if selected
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index cf20374da..c3242dbec 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -5,14 +5,6 @@
@import "../sass/base";
-
-// Colour tab to match colour scheme
-#nav-link {
- width: 50px;
- height: 48px;
- background: url('/cobrands/oxfordshire/images/tab-green.png') 0 0 no-repeat;
-}
-
#site-header {
background: none;
background-color: $oxfordshire_dk_green;
@@ -29,6 +21,10 @@
height: 38px;
}
+#nav-link {
+ height: 60px; // to match #site-header
+}
+
#main-nav ul#mysoc-menu li a#mysoc-logo {
background-image: none;
text-indent: 0;
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index b4c4d18da..a26f67ee8 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -439,6 +439,7 @@ p.label-valid {
width: 175px;
height: 40px;
top: 0.4em;
+ left: 0.5em;
background: url($image-sprite) -3px -3px no-repeat;
text-indent: -999999px;
position: absolute;
@@ -450,16 +451,36 @@ p.label-valid {
// this is a skip to nav for mobile users only
#nav-link {
- width: 50px;
- height: 48px;
- background: url($image-sprite) -5px -916px no-repeat;
+ width: 3em;
+ height: 3em; // same height as #site-header
+ background: transparent url(/cobrands/fixmystreet/images/menu-white.png) center center no-repeat;
+ background-image: url(/cobrands/fixmystreet/images/menu-white.svg), none;
+ background-size: 22px 18px;
display: block;
text-indent: -999999px;
position: absolute;
- right:2em;
- top:-2px;
- &:hover {
- top:2px;
+ right: 0;
+ top: 0.25em; // same as border-top on #site-header
+}
+
+// A shortcut to the Reporting page, in the mobile header
+#report-cta {
+ display: block;
+ position: absolute;
+ top: (3em / 2); // half the height of #site-header
+ right: 3.5em;
+ margin-top: -0.5em;
+
+ font-size: 0.9em;
+ line-height: 1em;
+ border: 1px solid #666;
+ color: #fff;
+ padding: 0.4em;
+ border-radius: 0.3em;
+
+ &:hover, &:focus {
+ text-decoration: none;
+ background-color: #444;
}
}
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 162bf30e1..67756ca5b 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -100,6 +100,7 @@ h1 {
}
#site-logo {
top: 0.9em;
+ left: auto;
position: absolute;
z-index: 3;
}
@@ -117,8 +118,10 @@ h1 {
top:-3.25em;
}
}
-#nav-link {
- left:-999999px;
+#nav-link,
+#report-cta {
+ right: auto;
+ left: -999999px;
}
#main-nav{
margin: 0 auto;
diff --git a/web/cobrands/trinidadtobago/base.scss b/web/cobrands/trinidadtobago/base.scss
index 77f91f57d..c8cb3c80e 100644
--- a/web/cobrands/trinidadtobago/base.scss
+++ b/web/cobrands/trinidadtobago/base.scss
@@ -22,12 +22,6 @@
}
#nav-link {
- width: 50px;
- height: 48px;
- background: url("/cobrands/trinidadtobago/images/sprite.png") -5px -916px no-repeat;
- display: block;
- text-indent: -999999px;
- position: absolute;
- right: 2em;
- top: -2px
-} \ No newline at end of file
+ background-image: url(/cobrands/fixmystreet/images/menu-black.png);
+ background-image: url(/cobrands/fixmystreet/images/menu-black.svg), none;
+}
diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss
index cdbdcbfbd..559d97a27 100644
--- a/web/cobrands/zurich/base.scss
+++ b/web/cobrands/zurich/base.scss
@@ -52,7 +52,7 @@
}
#site-header {
- background: $mobile_header_blue;
+ background: $mobile_header_blue;
border-top: 4px solid $mobile_menu_tab_bg_col;
height: 48px;
}
@@ -60,15 +60,9 @@
background: url(logo_portal.jpg) 0px -24px no-repeat;
width: 200px;
height: 48px;
- left:0;
+ left:0;
top:4px;
}
-// Colour tab to match colour scheme
-#nav-link {
- width: 50px;
- height: 48px;
- background: url('/cobrands/zurich/tab-white.png') 0 0 no-repeat;
-}
#front-howto #front_stats,
#front-main #postcodeForm {
background-color: $mobile_header_blue;