diff options
| -rw-r--r-- | templates/web/oxfordshire/header.html | 52 | ||||
| -rw-r--r-- | web/cobrands/oxfordshire/oxfordshire.scss | 124 |
2 files changed, 162 insertions, 14 deletions
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 6c338452a..e9a592fd4 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -34,7 +34,7 @@ </head> <body class="[% bodyclass | html IF bodyclass %]"> <div id="oxford-wrapper"> - <div id="oxford-header" class="desk-only"> + <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> <span id="oxford-links"> <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a>|<a href="/" title="">FixMyStreet</a> @@ -49,21 +49,51 @@ [% END %] </p> </div> + + + <div id="navigation"> + <div class="menubar"> + <div class="menu-inner"> + <ul class="menu"> + <li> + <[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %]>[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]> + </li> + </ul> + </div> + </div> + </div> + + + + </div> <!-- end of oxford header --> +<!-- <div id="oxford-main-menu" class="desk-only"> <ul class="tabs"> - <li class="home first"><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" - >[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END - %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END - %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li class="last"><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> + <li class="home first"></li>[% + %]<li></li>[% + %]<li></li>[% + %]<li></li>[% + %]<li class="last"></li> </ul> </div> +--> <div class="wrapper"> diff --git a/web/cobrands/oxfordshire/oxfordshire.scss b/web/cobrands/oxfordshire/oxfordshire.scss index 0429a622b..558dc4997 100644 --- a/web/cobrands/oxfordshire/oxfordshire.scss +++ b/web/cobrands/oxfordshire/oxfordshire.scss @@ -32,10 +32,15 @@ body { clear:both; overflow:hidden; position:relative; - width:958px; - height:84px; + width:958px; + + /* note================= */ + height: 133px; height:auto !important; - min-height:84px; + 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} @@ -182,3 +187,116 @@ body { } } +/* --------------------------------------------------------------------------------- + oxfordshire top menu starts + ---------------------------------------------------------------------------------*/ + +#navigation { + position: absolute; + left: 0; + top: 90px; + .menubar { + width: 972px; + padding: 0 0 0 18px; + border-top: 1px solid #004300; + + + + + } +} + + /* --------------------------------------------------------------------------------- + oxfordshire top menu ends + ---------------------------------------------------------------------------------*/ + +#navigation { + +/* menubar from e.g., http://fisd.oxfordshire.gov.uk/kb5/oxfordshire/fsd/includes/css/wireframe/navbar.css */ +.menubar { + color: #999999; + overflow: visible; + /*width: @gridWidth; only needed for contained menu*/ + + display: inline-block; + z-index: 100; +} + +.menubar .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; + + +} +.menubar .menu-inner .menu { + left: 0; + margin: 0 10px 0 0; + padding: 0; + position: relative; + list-style: none outside none; +} +.menubar .menu-inner .menu > li { + float: left; +} +.menubar .menu-inner .menu > li > a { + 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; +} +.menubar .menu-inner .menu > li a:hover { + color: #FFFFFF; +} +.menubar .menu-inner .menu .dropdown-menu { + background-clip: padding-box; + background-color: #ffffff; + border-color: rgba(0, 0, 0, 0.2); + border-style: solid; + border-width: 1px; + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + display: none; + float: left; + left: 0; + list-style: none outside none; + min-width: 160px; + padding: 4px 0; + position: absolute; + top: 40px; + z-index: 1001; +} +.menubar .menu-inner .menu .dropdown-menu a { + clear: both; + color: #333333; + display: block; + font-weight: normal; + line-height: 18px; + padding: 3px 15px; + white-space: nowrap; + text-decoration: none; + z-index: 1000; +} +.menubar .menu-inner .menu .dropdown-menu a:hover { + background-color: #069b01; + color: #ffffff; + text-decoration: none; +} +.menubar-fixed-top { + left: 0; + margin-bottom: 0; + position: fixed; + right: 0; + z-index: 1000; +} + +} + +.oxford-left { + float: left !important; +}
\ No newline at end of file |