diff options
| -rw-r--r-- | templates/web/fixmystreet/header.html | 18 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 4 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 23 |
3 files changed, 32 insertions, 13 deletions
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index f40f541bd..653cf75f4 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -39,13 +39,15 @@ <div class="container"> <div class="content" role="main"> - <ul id="user-meta"> - [% IF c.user_exists %] - <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %] - <li class="last"><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> - [% ELSE %] - <li> </li> - [% END %] - </ul> + <div id="user-meta"> + <ul> + [% IF c.user_exists %] + <li>[% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <li class="last"><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> + [% ELSE %] + <li> </li> + [% END %] + </ul> + </div> <!-- [% INCLUDE 'debug_header.html' %] --> diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index baaee2f9c..7798706d2 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -451,7 +451,9 @@ input.red-btn{ // this is the user's logged in details or the login link etc #user-meta { - @include list-reset-soft; + ul { + @include list-reset-soft; + } } diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index cd54a1853..8f031baf3 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -30,12 +30,12 @@ .nav-wrapper{ display: table-caption; .nav-wrapper-2{ - background: #222; width: 100%; height: 3.5em; position: fixed; border-top: 0.25em solid $primary; z-index:2; + background: #222; @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); } } @@ -140,9 +140,24 @@ z-index:1; } - - - +#user-meta{ + position: absolute; + top: -2.2em; + background:#fff; + height:2em; + @include box-shadow(#000000 0 0 6px 1px); + ul { + display:block; + background:#fff; + height:2em; + border-bottom:10px solid #fff; + padding:0 0.5em; + li { + float:left; + padding:0.25em 0.25em; + } + } +} // Wraps around #key-tools to bo .shadow-wrap{ |