From 530b2b22475a442069d843bec20dc05fba286c5a Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Fri, 14 Feb 2014 10:01:45 +0000 Subject: [PATCH] merging changes to less in master --- .../wagtailadmin/static/wagtailadmin/scss/components/forms.scss | 2 +- wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss | 1 + .../wagtailadmin/static/wagtailadmin/scss/layouts/login.scss | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index 416670c95..632df4a8f 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -378,7 +378,7 @@ li.focused > .help{ color:$color-red; clear:both; } -.error input[type=text], .error input[type=email], .error input[type=tel], .error textarea, .error select, .error .tagit{ +.error input, .error textarea, .error select, .error .tagit{ border-color:$color-red; background-color:$color-input-error-bg; } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss index 8465112c2..8d2acfded 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss @@ -63,6 +63,7 @@ h2{ } } a{ + outline:none; color:$color-link; text-decoration:none; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss index 7ba0eeb37..cc1b7de62 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss @@ -157,7 +157,7 @@ form{ display: inline-block; height: 100%; vertical-align: middle; - margin-left:-0.3em; + margin-left:-0.4em; } }