diff options
| -rw-r--r-- | templates/web/fixmystreet/header.html | 10 | ||||
| -rw-r--r-- | web/cobrands/sass/_layout.scss | 28 |
2 files changed, 32 insertions, 6 deletions
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 14dbf0ddc..3d69fbac6 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -26,7 +26,7 @@ <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = c.cobrand.site_title %] [% extra_js %] - + [% IF c.req.uri.host == 'osm.fixmystreet.com' %] <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]"> [% END %] @@ -46,16 +46,14 @@ </div> </header> + [% IF c.user_exists %] <div id="user-meta"> - [% IF c.user_exists %] <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] <a href="/auth/sign_out">[% loc('sign out') %]</a> </p> - [% ELSE %] - <!-- <a href="/auth">[% loc('Sign in') %]</a> --> - [% END %] </div> + [% END %] [% pre_container_extra %] diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index f03fa85ae..5a35d989b 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -271,6 +271,34 @@ body.mappage { #user-meta { max-width: none; + p { + display: block; + height: auto; + width: 22.2em; // 27em (.content width) - 2em (.content padding) - 6em - 0.8em + padding: 0.5em 6em 0.5em 0.8em; + top: 0; + left: 0; + z-index: 1; + box-shadow: none; + background: #FCEA9A; + border-bottom: 1px solid #ffd000; + + a { + // move the "Sign out" link in and down a bit, because of extra padding on parent + top: 0.8em; + right: 0.8em; + } + } + + & + .container .content { + padding-top: 3.5em; // make room for user menu! + } + } + + .banner { + p { + top: -2.1em; // a few pixels lower than default + } } } |