diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
| commit | b483a17c13ba8e273949ce4ee8c8c05e66b06647 (patch) | |
| tree | 3e928fa68c3edb90c0666ec52ad8c9982f9dab77 /web/css | |
| parent | 8deb709fa2d44bcbaba54734f7f4f4385980d8df (diff) | |
| parent | 62ffebc89cc66d32a828ea1de8c850c3e950faa1 (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/DB/Result/Comment.pm
perllib/FixMyStreet/DB/Result/User.pm
web/css/core.css
Diffstat (limited to 'web/css')
| -rw-r--r-- | web/css/core.css | 17 | ||||
| -rw-r--r-- | web/css/core.scss | 16 |
2 files changed, 32 insertions, 1 deletions
diff --git a/web/css/core.css b/web/css/core.css index 39f448b8c..937bf533d 100644 --- a/web/css/core.css +++ b/web/css/core.css @@ -113,7 +113,22 @@ background-color: #ccffcc; border: solid 2px #009900; padding: 5px; - text-align: center; } + text-align: center; +} +#mysociety #form_sign_in_yes { + float: left; + width: 47%; + padding-right: 1%; + border-right: solid 1px #999999; + margin-bottom: 1em; +} +#mysociety #form_sign_in_no, #mysociety #fieldset #form_sign_in_no { + float: right; + width: 47%; + padding-left: 1%; + clear: none; + margin-bottom: 1em; +} #mysociety #watermark { background: url("/i/mojwatermark6.png"); height: 113px; diff --git a/web/css/core.scss b/web/css/core.scss index 1c9d5f451..cbf15f16b 100644 --- a/web/css/core.scss +++ b/web/css/core.scss @@ -189,6 +189,22 @@ $map_width: 500px; text-align: center; } + #form_sign_in_yes { + float: left; + width: 47%; + padding-right: 1%; + border-right: solid 1px #999999; + margin-bottom: 1em; + } + + #form_sign_in_no, #fieldset #form_sign_in_no { + float: right; + width: 47%; + padding-left: 1%; + clear: none; + margin-bottom: 1em; + } + // Map #watermark { |