diff options
-rw-r--r-- | templates/web/default/footer.html | 6 | ||||
-rw-r--r-- | templates/web/default/header.html | 4 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/base.scss | 2 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 18 |
4 files changed, 15 insertions, 15 deletions
diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html index 8c5a92782..f060ca99b 100644 --- a/templates/web/default/footer.html +++ b/templates/web/default/footer.html @@ -1,15 +1,15 @@ </div><!-- #mysociety .container --> - <div id="top" class="container"> + <div id="navigation" class="container" role="navigation"> <div class="spacer"></div> - <ul id="top-nav" class="nav"> + <ul id="site-nav" class="nav"> <li><a href="/my">[% loc("Your reports") %]</a></li>[% %]<li><a href="/reports">[% loc("All reports") %]</a></li>[% %]<li><a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]">[% loc("Local alerts") %]</a></li>[% %]<li><a href="/faq">[% loc("Help") %]</a></li> </ul> - <ul id="mysociety-tab" class="nav"> + <ul id="mysociety-nav" class="nav"> <li><a id="mysociety-logo" href="http://www.mysociety.org/">mySociety</a></li>[% %]<li><a href="http://mysociety.org/donate/">Donate</a></li>[% %]<li><a href="http://www.mysociety.org/projects/">Our Sites</a></li> diff --git a/templates/web/default/header.html b/templates/web/default/header.html index b4f13f9fd..0985c7429 100644 --- a/templates/web/default/header.html +++ b/templates/web/default/header.html @@ -31,7 +31,7 @@ <div id="wrapper"><div id="wrapper2"><div id="wrapper3"> - [% IF NOT title AND NOT c.req.path %]<h1 id="header">[% ELSE %]<div id="header"><a href="/">[% END %] + [% IF NOT title AND NOT c.req.path %]<h1 id="header" role="banner">[% ELSE %]<div id="header" role="banner"><a href="/">[% END %] [%- loc('Fix<span id="my">My</span>Street') %] [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %] @@ -44,6 +44,6 @@ [% END %] </ul> - <div id="mysociety" class="container"> + <div id="mysociety" class="container" role="main"> [% INCLUDE 'debug_header.html' %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index affd3c46b..41a408a96 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -145,7 +145,7 @@ a:active, a:hover { margin: 0 auto; } -#top { +#navigation { display: table; width: 100%; border-top: solid 1px $colour; diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 01c23e8d0..826c5c979 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -37,7 +37,7 @@ body { /* Giving this a display: table-caption, and #wrapper3 a caption-side: top, * means that this div appears above the main content, even though it is below * it in source order. */ -#top { +#navigation { border: none; padding-top: 0; margin: 0; @@ -45,7 +45,7 @@ body { line-height: 1.2; } -#top .spacer { +#navigation .spacer { display: table-cell; width: 100%; } @@ -72,16 +72,16 @@ body { padding: 10px; } -ul#top-nav li a { +#site-nav li a { color: $colour; padding: 9px 20px 8px 0px; } -ul#top-nav li a:hover { +#site-nav li a:hover { color: #000; } -ul#mysociety-tab { +#mysociety-nav { line-height: 1.5; font-size: 68.75%; text-transform: uppercase; @@ -91,11 +91,11 @@ ul#mysociety-tab { -webkit-border-radius: 0 0 6px 6px; } -ul#mysociety-tab li a { +#mysociety-nav li a { color: #fff; } -ul#mysociety-tab li a:hover { +#mysociety-nav li a:hover { color: #000; } @@ -126,14 +126,14 @@ ul#mysociety-tab li a:hover { * items. */ .ie6, .ie7 { - #top { + #navigation { position: absolute; top: 7px; right: 0; width: 38em; } - #top .spacer { + #navigation .spacer { display: none; } |