diff options
| -rw-r--r-- | templates/web/fixmystreet/report/new/fill_in_details_form.html | 4 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/_base.scss | 28 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/_layout.scss | 6 |
3 files changed, 22 insertions, 16 deletions
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 4ee634677..b8a813348 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -111,7 +111,7 @@ [% IF c.user_exists %] <div class="form-box"> - <label for="form_may_show_nameme">[% loc('Name') %]</label> + <label for="form_name">[% loc('Name') %]</label> [% IF field_errors.name %] <p class='form-error'>[% field_errors.name %]</p> [% END %] @@ -170,7 +170,7 @@ [% INCLUDE 'report/new/extra_name.html' %] - <label for="form_may_show_nameme">[% loc('Name') %]</label> + <label for="form_name">[% loc('Name') %]</label> [% IF field_errors.name %] <p class='form-error'>[% field_errors.name %]</p> [% END %] diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss index 7c50115c1..48d128968 100644 --- a/web/cobrands/fixmystreet/_base.scss +++ b/web/cobrands/fixmystreet/_base.scss @@ -146,14 +146,8 @@ img { select, input, textarea { font-size: 99%; - max-width: 95%; + max-width: 100%; } -.ie7 { - select, input, textarea { - max-width: none; - } -} - // links a, @@ -246,10 +240,19 @@ input[type=password], input[type=email], input[type=file], textarea { + @include box-sizing(border-box); width: 100%; // adjust so the sides line up padding: 0.5em; - margin: 0 0 0 -0.5em; +} +.ie7 { + input[type=text], + input[type=password], + input[type=email], + input[type=file], + textarea { + max-width: 95%; + } } textarea { @@ -293,7 +296,6 @@ label{ margin: 0 -2em 0.25em -2em; background:#eeeeee; padding:1em 2em 1em 2em; - max-width:26em; >input[type=text] { margin-bottom:1em; } @@ -318,6 +320,14 @@ label{ // it looks okay. .ie6 .form-box { margin: 0 0 0.25em 0; + padding: 1em; +} +// Prevent grey displaying oddly by giving it a width, and stop odd left margin issue +.ie7 .form-box { + width: 100%; + > input[type=text] { + margin-left: 2em; + } } .form-txt-submit-box { diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss index 838d2c06e..833af8986 100644 --- a/web/cobrands/fixmystreet/_layout.scss +++ b/web/cobrands/fixmystreet/_layout.scss @@ -703,12 +703,8 @@ input[type=text], input[type=password], input[type=email], textarea{ - width: 25em; + max-width: 25em; } -.form-box { - max-width:25em; -} - /* form errors */ div.form-error, |