diff options
| -rw-r--r-- | templates/web/fixmystreet/header.html | 12 | ||||
| -rw-r--r-- | templates/web/fixmystreet/my/my.html | 4 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/new/fill_in_details_form.html | 4 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 32 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 22 |
5 files changed, 57 insertions, 17 deletions
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index ae9cb55a7..879f3c971 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -41,14 +41,14 @@ </header> <div id="user-meta"> + [% IF c.user_exists %] <p> - [% IF c.user_exists %] - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] | - <a href="/auth/sign_out">[% loc('sign out') %]</a> - [% ELSE %] - <a href="/auth">[% loc('Sign in') %]</a> - [% END %] + [% 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> <div class="container"> diff --git a/templates/web/fixmystreet/my/my.html b/templates/web/fixmystreet/my/my.html index 80721b5d6..b6a1e824c 100644 --- a/templates/web/fixmystreet/my/my.html +++ b/templates/web/fixmystreet/my/my.html @@ -47,7 +47,7 @@ END %] pager = updates_pager, param = 'u' %] - <ul class="issue-list"> + <ul class="issue-list full-width"> [% END %] <li>“[% u.text | html %]” @@ -64,7 +64,7 @@ END %] [% INCLUDE 'footer.html' %] [% BLOCK problem %] - [% "<ul class='issue-list-a'>" IF loop.first %] + [% "<ul class='issue-list-a full-width'>" IF loop.first %] <li> <a href="[% c.uri_for( '/report', p.id ) %]"> diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html index d0d284f04..800f72223 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -117,9 +117,7 @@ [% INCLUDE name_phone %] - <p id="problem_submit"> - <input type="submit" value="[% loc('Submit') %]"> - </p> + <input class="green-btn final-submit" type="submit" value="[% loc('Submit') %]"> [% ELSE %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 3d48c3cf4..9a950000e 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -383,6 +383,24 @@ label{ } +/* form errors */ +div.form-error, +p.form-error { + background:#ff0000; + color:#fff; + padding:0.5em; + margin:0 1em 0 0; + width:auto; + margin-bottom:0.5em; + @include border-radius(0.25em); +} + +input.form-error, +textarea.form-error { + border-color:#ff0000; + background-color:#ffeeee; +} + /* LAYOUT */ // Padding creates page margins on mobile @@ -473,8 +491,20 @@ label{ #user-meta { display:table-caption; p { + position: relative; background:$primary; - padding:1em; + padding:1em 6em 1em 1em; + 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); + } } } diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 7afc1e879..b3b1c1dc1 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -211,9 +211,19 @@ body { position:absolute; top:1em; height:2em; - background:#fff; - padding:0.25em 0.5em; + padding:0.25em 6em 0.5em 0.5em; @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; + } + } } } @@ -364,19 +374,21 @@ body.frontpage { width:100%; } .content { - padding-top:13em; + padding-top:14em; margin:0 auto; } } .nav-wrapper-2{ background: #1a1a1a; height:6em; + position:absolute; } #site-header{ - height:10em; + height:9em; } #site-logo{ - top:2em; + position: absolute; + top:3em; width: 300px; height: 60px; background-position:-2px -108px; |