Merge branch 'master' into production

kevinkosterr · kevinkosterr · commit c18e212a18e5 · 2024-10-18T12:54:00.000+02:00
diff --git a/src/scss/modules/_colors.scss b/src/scss/modules/_colors.scss
@@ -3,4 +3,7 @@ $hint-color: #9f9f9f;
 $strength-indicator-color: #00000019;
 
 $primary-default: #007bff;
-$primary-default-border: #0070e6;
+$primary-default-border: #0070e6;
+
+$secondary-default: #e3e3e3;
+$secondary-default-border: #d8d8d8;
diff --git a/src/scss/themes/basic.scss b/src/scss/themes/basic.scss
@@ -31,8 +31,8 @@ $input-padding: .3rem .4rem;
       min-width: 100px;
     }
 
-    &:focus {
-      border: none;
+    &:focus, &:active {
+      padding: $input-padding;
       outline: none;
     }
   }
@@ -115,7 +115,12 @@ $input-padding: .3rem .4rem;
   }
 
   .field-reset {
+    background: $secondary-default;
+    border: 2px solid $secondary-default-border;
     border-radius: 3px;
+    &:hover {
+      background: color.adjust($secondary-default, $lightness: -3%)
+    }
   }
 
   /** Switch field */

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ $input-padding: .3rem .4rem;`
`31`	`31`	`min-width: 100px;`
`32`	`32`	`}`
`33`	`33`
`34`		`- &:focus {`
`35`		`- border: none;`
	`34`	`+ &:focus, &:active {`
	`35`	`+ padding: $input-padding;`
`36`	`36`	`outline: none;`
`37`	`37`	`}`
`38`	`38`	`}`
`@@ -115,7 +115,12 @@ $input-padding: .3rem .4rem;`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`.field-reset {`
	`118`	`+ background: $secondary-default;`
	`119`	`+ border: 2px solid $secondary-default-border;`
`118`	`120`	`border-radius: 3px;`
	`121`	`+ &:hover {`
	`122`	`+ background: color.adjust($secondary-default, $lightness: -3%)`
	`123`	`+ }`
`119`	`124`	`}`
`120`	`125`
`121`	`126`	`/** Switch field */`