diff options
29 files changed, 34 insertions, 302 deletions
diff --git a/templates/web/angus/header.html b/templates/web/angus/header.html index a7199949d..19e9e7f68 100644 --- a/templates/web/angus/header.html +++ b/templates/web/angus/header.html @@ -50,15 +50,6 @@ </div> </header> - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% INCLUDE 'post_header_extra.html' %] [% pre_container_extra %] diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html index c10d9c008..d046d6297 100644 --- a/templates/web/base/footer.html +++ b/templates/web/base/footer.html @@ -23,7 +23,7 @@ >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="[% base %]/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="[% base %]/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% diff --git a/templates/web/base/header.html b/templates/web/base/header.html index 5f4fba1df..8e5cb3c73 100644 --- a/templates/web/base/header.html +++ b/templates/web/base/header.html @@ -56,15 +56,6 @@ </div> </header> - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% pre_container_extra %] <div class="container"> diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html index b56998161..4d5fed1cd 100644 --- a/templates/web/base/my/my.html +++ b/templates/web/base/my/my.html @@ -14,9 +14,16 @@ <div id="skipped-map"> [% END %] -<h1>[% loc('Your Reports') %]</h1> +<h1>[% loc('Your account') %]</h1> -<p><a href="/auth/change_password">[% loc('Change password') %]</a></p> +<p>[% c.user.name %] [% c.user.email %]</p> + +<p class="my-account-buttons"> + <a href="/auth/change_password">[% loc('Change password') %]</a> + <a href="/auth/sign_out">[% loc('Sign out') %]</a> +</p> + +<h2>[% loc('Your reports') %]</h2> [% IF ! has_content %] [% tprintf( loc('You haven’t created any reports yet. <a href="%s">Report a problem now.</a>'), diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html index 6412ec03c..87d244480 100644 --- a/templates/web/bromley/footer.html +++ b/templates/web/bromley/footer.html @@ -14,7 +14,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% 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 diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html index f5088bcb4..8bc9f5d4f 100644 --- a/templates/web/fiksgatami/footer.html +++ b/templates/web/fiksgatami/footer.html @@ -18,7 +18,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% 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 diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html index b6ca67d24..3e77e89ca 100644 --- a/templates/web/fiksgatami/header.html +++ b/templates/web/fiksgatami/header.html @@ -41,15 +41,6 @@ </div> </header> - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% pre_container_extra %] <div class="container"> diff --git a/templates/web/fiksgatami/nn/footer.html b/templates/web/fiksgatami/nn/footer.html index d7703388a..08ec155f5 100644 --- a/templates/web/fiksgatami/nn/footer.html +++ b/templates/web/fiksgatami/nn/footer.html @@ -18,7 +18,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% 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 diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html index 376d79ff4..64d39e622 100644 --- a/templates/web/fixamingata/footer.html +++ b/templates/web/fixamingata/footer.html @@ -14,7 +14,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% 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 diff --git a/templates/web/fixmindelo/footer.html b/templates/web/fixmindelo/footer.html index afd8984c7..76ebef40c 100644 --- a/templates/web/fixmindelo/footer.html +++ b/templates/web/fixmindelo/footer.html @@ -36,7 +36,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% 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 diff --git a/templates/web/greenwich/footer.html b/templates/web/greenwich/footer.html index 7ff0dd0af..a7c939358 100644 --- a/templates/web/greenwich/footer.html +++ b/templates/web/greenwich/footer.html @@ -14,7 +14,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports/Royal+Borough+of+Greenwich' %]span[% ELSE %]a href="/reports"[% 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 diff --git a/templates/web/harrogate/footer.html b/templates/web/harrogate/footer.html index 625096b32..a37f94a35 100644 --- a/templates/web/harrogate/footer.html +++ b/templates/web/harrogate/footer.html @@ -19,7 +19,7 @@ [% selected = c.req.uri.path == '/my' %] <li> <[% IF selected %]span[% ELSE %]a href="/my"[% END %]> - [% loc("Your reports") %]</[% selected ? 'span' : 'a' %]></li> + [% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% selected ? 'span' : 'a' %]></li> [% selected = c.req.uri.path == '/reports/Harrogate' %] <li> diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html index 7ee3a93d2..8612cb3f8 100644 --- a/templates/web/harrogate/header.html +++ b/templates/web/harrogate/header.html @@ -45,15 +45,6 @@ </div> </header> - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% pre_container_extra %] <div class="container"> diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index 3153125fd..26bdf7ab2 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -18,7 +18,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% 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 diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 6ad9b8f62..6c4427414 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -38,15 +38,6 @@ <div style="clear:both"></div> <span class="header"><a href="/">Report a road or street problem</a></span> - [% IF c.user_exists %] - <div class="oxford-user"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('Sign out') %]</a> - </p> - </div> - [% END %] - <div id="navigation"> <div class="menubar"> <div class="menu-inner"> @@ -56,7 +47,7 @@ </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' %]> + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% ( 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 @@ -87,15 +78,6 @@ </div> </header> - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% pre_container_extra %] <div class="container"> diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html index b81a949a1..3fcd9b5a1 100644 --- a/templates/web/stevenage/footer.html +++ b/templates/web/stevenage/footer.html @@ -94,7 +94,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports/Stevenage' %]span[% ELSE %]a href="/reports/Stevenage"[% 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 diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index 1f124f5aa..fb6f2ae5b 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -35,16 +35,6 @@ <a href="#main-nav" id="nav-link">Main Navigation</a> </div> </header> - - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% pre_container_extra %] <div class="container"> diff --git a/templates/web/trinidadtobago/footer.html b/templates/web/trinidadtobago/footer.html index bace22e71..ac90417d6 100644 --- a/templates/web/trinidadtobago/footer.html +++ b/templates/web/trinidadtobago/footer.html @@ -20,7 +20,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% 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 diff --git a/web/cobrands/angus/base.scss b/web/cobrands/angus/base.scss index 54e9b25b3..efe540630 100644 --- a/web/cobrands/angus/base.scss +++ b/web/cobrands/angus/base.scss @@ -26,7 +26,7 @@ body.frontpage #site-logo, } } -.item-list--reports__item, #user-meta p, #front-main #postcodeForm { +.item-list--reports__item, #front-main #postcodeForm { // background-color: $greenwich_light_grey; } @@ -61,4 +61,4 @@ label[for=pc] { margin: 0 0.3em 0 0.2em; border-radius: 100%; vertical-align: -2px; -}
\ No newline at end of file +} diff --git a/web/cobrands/angus/layout.scss b/web/cobrands/angus/layout.scss index 7a129c3cf..35d629400 100644 --- a/web/cobrands/angus/layout.scss +++ b/web/cobrands/angus/layout.scss @@ -165,17 +165,6 @@ body.frontpage { background-color: $base_bg; } } - #user-meta p { - right: -119px; - top: -93px; - margin: 0; - padding: 0; - color: $base_bg; - - a { - position: static; - } - } } body.twothirdswidthpage .content .sticky-sidebar { @@ -378,16 +367,6 @@ body.mappage { } } - #user-meta { - p { - color: $primary_text; - } - - & ~ .container .content { - padding-top: 3.5em; // make room for user menu! - } - } - #category_meta h4 { display: none; } @@ -399,12 +378,6 @@ body.mappage { } } -#user-meta p { - top: 6em; - left: -6em; - color: $angus_light_grey; -} - .angus_footer { border-top: solid 8px $angus_grey; background: $angus_dark_grey; diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss index ed3ba193f..27bd45889 100644 --- a/web/cobrands/bromley/layout.scss +++ b/web/cobrands/bromley/layout.scss @@ -64,32 +64,6 @@ body.alertindex form.full-width { margin-left: 0; } -// Override the little banner you get when you're logged in on the map page -// because FMS makes it a different colour and moves it over to the left. -body.mappage #user-meta p { - background-color: $bromley_blue; - border-bottom: 1px solid #444; -} - -// And also override the banner on other pages so that it lines up properly -#user-meta, body.mappage #user-meta { - max-width: 1200px; -} -#user-meta p, -body.frontpage #user-meta p { - top: 0; - right: auto; - background-color: $bromley_blue; - color: #fff; - box-shadow: none; -} - -// Because we've moved the user-meta, we also have to move the #front-main div -// down a bit so that it shows the #user-meta -#front-main { - margin-top:3em -} - // The page h1 needs to be white on desktop, because it's in a blue box h1.main { color: #fff; diff --git a/web/cobrands/greenwich/base.scss b/web/cobrands/greenwich/base.scss index 69b9db052..8b665501c 100644 --- a/web/cobrands/greenwich/base.scss +++ b/web/cobrands/greenwich/base.scss @@ -29,7 +29,7 @@ body.frontpage #site-logo, background-size: cover; } -.item-list--reports__item, #user-meta p, #front-main #postcodeForm { +.item-list--reports__item, #front-main #postcodeForm { background-color: $greenwich_light_grey; } diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss index eff3f854e..df572341e 100644 --- a/web/cobrands/greenwich/layout.scss +++ b/web/cobrands/greenwich/layout.scss @@ -68,10 +68,6 @@ body.frontpage #site-header, #site-header { } body.frontpage { - #user-meta p { - top: -9em; - } - .item-list--reports__item { border-left: solid 4px $primary; } @@ -83,11 +79,6 @@ body.frontpage { } } -body.twothirdswidthpage #user-meta p { - padding-bottom: 0; - z-index: 2; -} - .nav-wrapper .nav-wrapper-2 { border-top: none; } diff --git a/web/cobrands/harrogate/layout.scss b/web/cobrands/harrogate/layout.scss index 904a707b1..82be53820 100644 --- a/web/cobrands/harrogate/layout.scss +++ b/web/cobrands/harrogate/layout.scss @@ -39,10 +39,6 @@ $mappage-header-height: 10em; body.fullwidthpage .container .content footer .tablewrapper a:visited { color: white; } - - body.mappage #user-meta+.container .content { - padding-top: 1.5em; - } } #main-nav { @@ -123,18 +119,6 @@ body.mappage .nav-wrapper .nav-wrapper-2 { } -body.frontpage #user-meta p { - top: -2.4em; -} - -body.mappage #user-meta { - top: 2em; - p { - background: $primary; - border-color: $primary_dark; - } -} - body.mappage .content { margin-top: 4em; } diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss index b6446e38c..bc78a8681 100644 --- a/web/cobrands/oxfordshire/layout.scss +++ b/web/cobrands/oxfordshire/layout.scss @@ -28,8 +28,7 @@ body, body a { } // Currently hide the nav-wrapper, because it's in going into Oxfordshire's own nav -// likewise with user-meta -.nav-wrapper, #user-meta { +.nav-wrapper { display: none; } @@ -158,25 +157,6 @@ body.mappage { } } } - - .oxford-user { - display: block; - font-size: 13px; - margin: 0; - color: mix(#ddd, #069b01, 80%); - - p { - margin: 0; - padding-top: ($mappage-header-height - 20px) / 2; - padding-bottom: ($mappage-header-height - 20px) / 2; - line-height: 20px; - } - - a { - padding: 0 10px; - text-decoration: none; - } - } } .wrapper .table-cell { diff --git a/web/cobrands/oxfordshire/oxfordshire.scss b/web/cobrands/oxfordshire/oxfordshire.scss index 46de1f22b..20a38ac7f 100644 --- a/web/cobrands/oxfordshire/oxfordshire.scss +++ b/web/cobrands/oxfordshire/oxfordshire.scss @@ -64,16 +64,6 @@ body { margin: 0px 5px 0px 5px } } - .oxford-user { - float: right; - p { - padding: 0.25em; - margin: 0.5em 0; - a { - margin: 0 0.5em; - } - } - } } #oxford-main-menu { diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index dfe03ebf1..822739cda 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -554,27 +554,6 @@ body.mappage .wrapper { position: static; } -// this is the user's logged in details or the login link etc -#user-meta { - p { - position: relative; - color: $primary_text; - background: $primary; - padding: flip(1em 6em 1em 1em, 1em 1em 1em 6em); - a { - position: absolute; - #{$right}: 1em; - @include inline-block; - text-transform:uppercase; - font-size:0.75em; - background:#333; - padding:0.25em 0.75em; - color:#fff; - @include border-radius(0.25em); - } - } -} - // #key-tools is the list that's pulled out an stick to the bottom of the page of desktop, below is mostly just aesthetic .shadow-wrap { @@ -1817,6 +1796,13 @@ table.nicetable { } } +.my-account-buttons a { + display: inline-block; + background: #f6f6f6; + padding: 0.5em 1em; + border-radius: 0.2em; +} + @media screen { .print-only { diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index e0913b0ee..c0c213be1 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -296,32 +296,6 @@ body.mappage { margin: 0.9em 0.25em 0.85em; } - #user-meta { - max-width: none; - p { - display: block; - height: auto; - width: 22.2em; // 27em (.content width) - 2em (.content padding) - 6em - 0.8em - padding: flip(0.5em 6em 0.5em 0.8em, 0.5em 0.8em 0.5em 6em); - 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 @@ -346,9 +320,6 @@ body.mappage { #site-logo { position: absolute; } - #user-meta { - margin-#{$left}: 2em; - } } } //ie8 needs different stuff on .nav-wrapper so we @@ -715,45 +686,6 @@ body.authpage { } } -// log in bit, pokes above the .content div -#user-meta{ - display:block; - position: relative; - max-width: 60em; - margin: 0 auto; - p { - @include inline-block; - position: absolute; - top: 1em; - #{$left}: 1em; - height:2em; - padding: flip(0.25em 6em 0.5em 0.5em, 0.25em 0.5em 0.5em 6em); - @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); - a { - top:0.5em; - #{$right}: 0.5em; - font-size:0.6875em; - padding:0.5em 0.75em; - line-height:1em; - &:hover { - text-decoration:none; - background:#444; - } - } - } -} -.ie6, .ie7 { - #user-meta { - z-index:1; - p { - top:-2em; - } - } -} -.ie6 #user-meta { - width: 60em; //ie6 doesn't like max-width -} - // Wraps around #key-tools box - sticks to the bottom of the screen on desktop .shadow-wrap { @@ -967,24 +899,6 @@ body.frontpage { height: 60px; background: url($image-sprite) -2px -108px no-repeat; } - #user-meta { - z-index:10; - p { - top: -4em; - #{$left}: auto; - #{$right}: 0; - color:$primary; - background:none; - @include box-shadow(rgba(0, 0, 0, 0) 0 0 0); - a { - background:#fff; - color:#1a1a1a; - &:hover { - background:#ddd; - } - } - } - } } //logo fix .iel8 { diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss index 19dc38470..76e2f92b8 100644 --- a/web/cobrands/stevenage/layout.scss +++ b/web/cobrands/stevenage/layout.scss @@ -106,11 +106,8 @@ body.frontpage { .nav-wrapper-2 { height: auto; } - // 1162d5c8 - Changed the colour of the user text when you're logged in to be more readable - #user-meta { - p { - color: #fff; - } + #site-header { + height: auto; } } |