From b8925d857d5f50d065ba6b3b379a2f3fd826c141 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 7 Mar 2019 14:16:39 +0000
Subject: [PATCH] Reorganize field validity styles

* The field border style was previously moved up to the field
* Validity colors should be shown regardless of focus state
---
 res/css/views/elements/_Field.scss | 38 +++++++++++++++---------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss
index 22bc6a1800..20b1efd28b 100644
--- a/res/css/views/elements/_Field.scss
+++ b/res/css/views/elements/_Field.scss
@@ -141,28 +141,28 @@ limitations under the License.
     color: $greyed-fg-color;
 }
 
-.mx_Field_valid input,
-.mx_Field_valid select,
-.mx_Field_valid textarea {
-    border-color: $input-valid-border-color ! important;
+.mx_Field_valid {
+    &.mx_Field,
+    &.mx_Field:focus-within {
+        border-color: $input-valid-border-color;
+    }
+
+    &.mx_Field label,
+    &.mx_Field:focus-within label {
+        color: $input-valid-border-color;
+    }
 }
 
-.mx_Field_valid input + label,
-.mx_Field_valid select + label,
-.mx_Field_valid textarea + label {
-    color: $input-valid-border-color ! important;
-}
+.mx_Field_invalid {
+    &.mx_Field,
+    &.mx_Field:focus-within {
+        border-color: $input-invalid-border-color;
+    }
 
-.mx_Field_invalid input,
-.mx_Field_invalid select,
-.mx_Field_invalid textarea {
-    border-color: $input-invalid-border-color ! important;
-}
-
-.mx_Field_invalid input + label,
-.mx_Field_invalid select + label,
-.mx_Field_invalid textarea + label {
-    color: $input-invalid-border-color ! important;
+    &.mx_Field label,
+    &.mx_Field:focus-within label {
+        color: $input-invalid-border-color;
+    }
 }
 
 .mx_Field_tooltip {