From 030aaf1768789f1b06e0f92280436c92cd66592c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 11 Mar 2020 13:21:26 +0300 Subject: [PATCH] InputField: hide error when component is disabled --- .../main/resources/less/asc-mixins.less | 2 +- apps/common/main/resources/less/input.less | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index 8cf2ee651..cf1530737 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -98,7 +98,7 @@ .button-otherstates-icon(@icon-class, @icon-size) { .btn { &:active, &.active { - &:not(:disabled):not(.disabed) { + &:not(:disabled):not(.disabled) { > .@{icon-class} { @iconsize: -1*@icon-size; diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less index ee527b6ab..86e89185a 100644 --- a/apps/common/main/resources/less/input.less +++ b/apps/common/main/resources/less/input.less @@ -47,20 +47,20 @@ position: relative; } - &.error { - input { - border-color: @brand-danger; - } - - .input-error { - display: block; - } - } - &.form-control:focus, .form-control:focus { border-color: @gray-darker; } + + &.error { + input:not([disabled]) { + border-color: @brand-danger; + } + + input:not([disabled]) + .input-error { + display: block; + } + } } input:required:focus:invalid,