Merge branch 'develop' of github.com:b2wads/grimorio-ui into feat/inp…

…uts-design
b2wads · Sep 5, 2023 · 771f9f4 · 771f9f4
2 parents f7af905 + bc85244
commit 771f9f4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@b2wads/grimorio-ui",
   "sideEffects": false,
-  "version": "10.1.8-beta",
+  "version": "10.1.9-beta",
   "description": "UI just like magic",
   "main": "lib/index.js",
   "repository": "https://github.com/b2wads/grimorio-ui",

diff --git a/source/components/form/elements/form-control.styl b/source/components/form/elements/form-control.styl
@@ -144,7 +144,7 @@ Form Control Component
   margin-top: 0;
   padding: 24px 10px 22px;
 
-    &:focus {
+    &:focus:not(.isDisabled, .has-error, .has-warning)  {
     outline: 1px solid $c-label;
     border-color: $c-label;
     color: var(--c-support-dark);

diff --git a/source/components/select/select.styl b/source/components/select/select.styl
@@ -221,7 +221,7 @@ $field {
     top: 10px;
   }
 
-  .isFocus {
+  .isFocus:not(.isDisabled, .has-error, .has-warning) {
     border-color: $c-blue-1!important;
     outline: 1px solid $c-blue-1;
   }