From 7171c53cc85a97bdab775f6bf20fb5f5e9deade1 Mon Sep 17 00:00:00 2001 From: David O'Regan Date: Wed, 15 Apr 2020 17:30:34 +0100 Subject: [PATCH 1/4] fix(GlFormTextArea): Apply error styles --- src/components/base/form/form_textarea/form_textarea.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/base/form/form_textarea/form_textarea.scss b/src/components/base/form/form_textarea/form_textarea.scss index f57653b03f..b13f10fcac 100644 --- a/src/components/base/form/form_textarea/form_textarea.scss +++ b/src/components/base/form/form_textarea/form_textarea.scss @@ -15,4 +15,12 @@ @include gl-font-regular; @include gl-text-gray-900; } + + &.is-invalid { + @include gl-inset-border-1-red-500; + + &:focus { + @include gl-focus($gl-border-size-1, $red-500); + } + } } -- GitLab From 4dbcee4485232ad90049e966b0fc452a4be400d4 Mon Sep 17 00:00:00 2001 From: David O'Regan Date: Wed, 15 Apr 2020 19:07:34 +0100 Subject: [PATCH 2/4] fix(GlFormTextArea): Apply error styles --- .../base/form/form_textarea/form_textarea.scss | 11 ----------- .../base/form/form_textarea/form_textarea.vue | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/components/base/form/form_textarea/form_textarea.scss b/src/components/base/form/form_textarea/form_textarea.scss index b13f10fcac..e9ed973684 100644 --- a/src/components/base/form/form_textarea/form_textarea.scss +++ b/src/components/base/form/form_textarea/form_textarea.scss @@ -1,26 +1,15 @@ .gl-form-textarea, .gl-form-textarea.form-control { - @include gl-border-none; @include gl-font-base; @include gl-font-regular; @include gl-h-11-5; - @include gl-inset-border-1-gray-200; @include gl-line-height-normal; @include gl-py-3; @include gl-px-4; @include gl-text-gray-900; - @include form-control-focus; &:focus { @include gl-font-regular; @include gl-text-gray-900; } - - &.is-invalid { - @include gl-inset-border-1-red-500; - - &:focus { - @include gl-focus($gl-border-size-1, $red-500); - } - } } diff --git a/src/components/base/form/form_textarea/form_textarea.vue b/src/components/base/form/form_textarea/form_textarea.vue index e1d4f31f4e..3db4b94474 100644 --- a/src/components/base/form/form_textarea/form_textarea.vue +++ b/src/components/base/form/form_textarea/form_textarea.vue @@ -20,7 +20,7 @@ export default {