diff options
| author | Dave Whiteland <dave@mysociety.org> | 2013-01-17 14:53:47 +0000 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2013-01-17 14:53:47 +0000 |
| commit | 01680e887e138a502ac81e7c9fbb87919234c18c (patch) | |
| tree | 61029c583b128b5f641e68ab419a6091c17722c5 | |
| parent | 5624acf7ce76c869f0ab6e442131103cb4d5c299 (diff) | |
Zurich: add wrapper div to admin nav to allow 'tab' border to overlap
| -rw-r--r-- | templates/web/zurich/admin/header.html | 34 | ||||
| -rw-r--r-- | web/cobrands/zurich/_zurich.scss | 44 |
2 files changed, 43 insertions, 35 deletions
diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html index cc24b7394..1dd280f90 100644 --- a/templates/web/zurich/admin/header.html +++ b/templates/web/zurich/admin/header.html @@ -19,22 +19,24 @@ select { width: auto; } </style> <!--<strong>[% loc('FixMyStreet admin:') %]</strong>--> - <ul class="admin-nav"> - <li> - <a href="/admin/summary">[% loc('Summary') %]</a> - </li> - [% IF admin_type == 'dm' OR admin_type == 'super' %] - <li> - <a href="/admin/bodies">[% loc('Bodies') %]</a> - </li> - <li> - <a href="/admin/reports">[% loc('Reports') %]</a> - </li> - <li class="search-box"> - Search - </li> - - </ul> + <div class="admin-nav"> + <ul> + <li class="current"> + <a href="/admin/summary">[% loc('Summary') %]</a> + </li> + [% IF admin_type == 'dm' OR admin_type == 'super' %] + <li> + <a href="/admin/bodies">[% loc('Bodies') %]</a> + </li> + <li> + <a href="/admin/reports">[% loc('Reports') %]</a> + </li> + <li class="search-box"> + Search + </li> + + </ul> + </div> <!-- | <a href="timeline">Timeline</a> --> <!-- | <a href="questionnaire">Survey</a> --> <!-- | <a href="/admin/users">[% loc('Users') %]</a> --> diff --git a/web/cobrands/zurich/_zurich.scss b/web/cobrands/zurich/_zurich.scss index b1875e86d..e6769246f 100644 --- a/web/cobrands/zurich/_zurich.scss +++ b/web/cobrands/zurich/_zurich.scss @@ -32,30 +32,36 @@ a:hover { } .admin { - ul.admin-nav { - overflow:auto; + .admin-nav { background: #f4f4f4; - margin:0 0 1em 0; - list-style: none; - padding: 0; - border-top: 1px solid $table_border_color; - border-left: 1px solid $table_border_color; border-bottom: 2px solid $table_border_color; - li { - border-right: 1px solid $table_border_color; - display: inline; - float:left; + margin: 0 0 1em 0; + ul { + overflow:auto; + margin:0 0 -2px 0; list-style: none; - margin:0; - padding: 0.5em 1em; - font-weight: bold; - color: #000; - a { + padding: 0; + border-top: 1px solid $table_border_color; + border-left: 1px solid $table_border_color; + li { + border-right: 1px solid $table_border_color; + float:left; + list-style: none; + margin:0; + padding: 0.5em 1em; + font-weight: bold; color: #000; + a { + color: #000; + } + } + li.search-box { + float: right; + } + li.current { + background-color: #fff; + border-bottom: 2px solid #fff; } - } - li.search-box { - float: right; } } table { |