From 912454095cba9130554df24968d308026f1a63a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 15 Oct 2015 14:09:41 +0200 Subject: [PATCH] Edit error message position --- app/styles/core/forms.scss | 10 ---------- app/styles/dependencies/helpers.scss | 13 ++++++++----- app/styles/layout/login.scss | 6 ------ app/styles/modules/admin/project-values.scss | 6 ------ app/styles/modules/common/lightbox.scss | 7 +++---- app/themes/high-contrast/custom.scss | 6 +++--- app/themes/material-design/custom.scss | 6 +++--- app/themes/taiga/custom.scss | 5 +++-- 8 files changed, 20 insertions(+), 39 deletions(-) diff --git a/app/styles/core/forms.scss b/app/styles/core/forms.scss index 708a362d..ff38810d 100644 --- a/app/styles/core/forms.scss +++ b/app/styles/core/forms.scss @@ -4,11 +4,6 @@ fieldset { padding: 0; position: relative; width: 100%; - label { - ~.checksley-error-list { - top: 31px; - } - } .icon-capslock { cursor: pointer; } @@ -38,12 +33,7 @@ textarea { .checksley-error-list { - @extend %small; margin-bottom: 0; - padding: 0 .5rem; - position: absolute; - right: 2rem; - top: 10px; li { padding: .2rem; } diff --git a/app/styles/dependencies/helpers.scss b/app/styles/dependencies/helpers.scss index 45286c94..2cde055c 100644 --- a/app/styles/dependencies/helpers.scss +++ b/app/styles/dependencies/helpers.scss @@ -25,10 +25,15 @@ top: 0; z-index: 99910; .close { - @extend %large; + @extend %xlarge; + color: $gray; position: absolute; right: 2rem; - top: 2rem; + top: 1rem; + transition: color .2s; + &:hover { + color: $primary; + } } &.open { align-content: center; @@ -45,9 +50,7 @@ .title { text-align: center; } - input, - textarea, - select { + fieldset { margin-bottom: 1rem; } textarea { diff --git a/app/styles/layout/login.scss b/app/styles/layout/login.scss index 8e20b643..d911cf3d 100644 --- a/app/styles/layout/login.scss +++ b/app/styles/layout/login.scss @@ -58,10 +58,4 @@ color: $white; } } - .checksley-error-list { - right: 1rem; - +.forgot-pass { - display: none; - } - } } diff --git a/app/styles/modules/admin/project-values.scss b/app/styles/modules/admin/project-values.scss index 2dded76c..7ef3ae5b 100644 --- a/app/styles/modules/admin/project-values.scss +++ b/app/styles/modules/admin/project-values.scss @@ -51,12 +51,6 @@ .project-values-value { flex-basis: 0; flex-grow: 1; - .checksley-error-list { - left: 0; - right: auto; - top: 35px; - white-space: nowrap; - } } .project-values-isclosed, diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss index baa7fadc..a3eef28d 100644 --- a/app/styles/modules/common/lightbox.scss +++ b/app/styles/modules/common/lightbox.scss @@ -107,7 +107,6 @@ max-width: 600px; } textarea { - margin-bottom: 1rem; max-height: 12rem; min-height: 15rem; } @@ -119,7 +118,7 @@ flex-grow: 0; max-width: 600px; } - input { + fieldset { margin-bottom: 1rem; } } @@ -147,8 +146,7 @@ .extra-text { margin-top: 1rem; } - input, - select { + fieldset { margin-bottom: 0; } select { @@ -159,6 +157,7 @@ margin-left: .5rem; } .icon-delete { + @extend %xlarge; &:hover { color: $red; } diff --git a/app/themes/high-contrast/custom.scss b/app/themes/high-contrast/custom.scss index 776f07eb..1bb79bd3 100644 --- a/app/themes/high-contrast/custom.scss +++ b/app/themes/high-contrast/custom.scss @@ -94,11 +94,11 @@ textarea { } } - // Input errors .checksley-error-list { - background: rgba($whitish, .8); - color: $red; + @extend %light; + background: rgba($red, .7); + color: $white; } // Blockquote diff --git a/app/themes/material-design/custom.scss b/app/themes/material-design/custom.scss index 667b7ba6..472ad2b4 100644 --- a/app/themes/material-design/custom.scss +++ b/app/themes/material-design/custom.scss @@ -89,11 +89,11 @@ textarea { } } - // Input errors .checksley-error-list { - background: rgba($whitish, .8); - color: $red; + @extend %light; + background: rgba($red, .7); + color: $white; } // Blockquote diff --git a/app/themes/taiga/custom.scss b/app/themes/taiga/custom.scss index daf12698..6bb7c4c8 100644 --- a/app/themes/taiga/custom.scss +++ b/app/themes/taiga/custom.scss @@ -74,8 +74,9 @@ textarea { // Input errors .checksley-error-list { - background: rgba($whitish, .8); - color: $red; + @extend %light; + background: rgba($red, .7); + color: $white; } // Blockquote