Merge branch 'dev' into ll/fix-form-element-margin-bottom-in-grid

lucaslarroche · lucaslarroche · commit 843bc5151342 · 2024-03-03T11:25:53.000+07:00
diff --git a/scss/forms/_basics.scss b/scss/forms/_basics.scss
@@ -407,6 +407,7 @@
       option {
         &:checked {
           background: var(#{$css-var-prefix}form-element-selected-background-color);
+          color: var(#{$css-var-prefix}form-element-color);
         }
       }
     }
diff --git a/scss/forms/_checkbox-radio-switch.scss b/scss/forms/_checkbox-radio-switch.scss
@@ -126,7 +126,9 @@
       background-image: none;
 
       &::before {
-        margin-inline-start: calc(#{$switch-width * 0.5} - var(#{$css-var-prefix}border-width));
+        margin-inline-start: calc(
+          #{$switch-width} - #{$switch-height} / 2 - var(#{$css-var-prefix}border-width) * 3
+        );
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -407,6 +407,7 @@`
`407`	`407`	`option {`
`408`	`408`	`&:checked {`
`409`	`409`	`background: var(#{$css-var-prefix}form-element-selected-background-color);`
	`410`	`+ color: var(#{$css-var-prefix}form-element-color);`
`410`	`411`	`}`
`411`	`412`	`}`
`412`	`413`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,9 @@`
`126`	`126`	`background-image: none;`
`127`	`127`
`128`	`128`	`&::before {`
`129`		`- margin-inline-start: calc(#{$switch-width * 0.5} - var(#{$css-var-prefix}border-width));`
	`129`	`+ margin-inline-start: calc(`
	`130`	`+ #{$switch-width} - #{$switch-height} / 2 - var(#{$css-var-prefix}border-width) * 3`
	`131`	`+ );`
`130`	`132`	`}`
`131`	`133`	`}`
`132`	`134`