Merge pull request #479 from MatthewKennedy/fix/scss-css-issue

oyejorge · web-flow · commit 457f52ca6475 · 2022-09-26T23:11:08.000-06:00
Fix scss picking up css max
diff --git a/src/plugins/clear_button/plugin.scss b/src/plugins/clear_button/plugin.scss
@@ -1,9 +1,6 @@
-
 .plugin-clear_button{
-
 	--ts-pr-clear-button: 1em;
 
-
 	.clear-button{
 		opacity:		0;
 		position:		absolute;
@@ -20,18 +17,15 @@
 	&.single .clear-button{
 
 		@if variable-exists(select-padding-dropdown-item-x) {
-			right:		max( var(--ts-pr-caret), #{$select-padding-dropdown-item-x});
+			right:	Max( var(--ts-pr-caret), #{$select-padding-dropdown-item-x});
 		}
 		@else{
-			right:		max( var(--ts-pr-caret), calc(#{$select-padding-x} - #{$select-padding-item-x}) );
+			right:	Max( var(--ts-pr-caret), calc(#{$select-padding-x} - #{$select-padding-item-x}) );
 		}
 	}
 
 	&.focus.has-items .clear-button,
 	&:not(.disabled):hover.has-items .clear-button{
 		opacity:		1;
 	}
-
-
-
 }
diff --git a/src/scss/tom-select.scss b/src/scss/tom-select.scss
@@ -99,7 +99,7 @@ $select-spinner-border-color:					$select-color-border !default;
 }
 
 .#{$select-ns}-control {
-	padding-right:	max( var(--ts-pr-min), calc( var(--ts-pr-clear-button) + var(--ts-pr-caret)) ) !important;
+	padding-right:	Max( var(--ts-pr-min), calc( var(--ts-pr-clear-button) + var(--ts-pr-caret)) ) !important;
 }
 
 @mixin ts-caret(){

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`		`-`
`2`	`1`	`.plugin-clear_button{`
`3`		`-`
`4`	`2`	`--ts-pr-clear-button: 1em;`
`5`	`3`
`6`		`-`
`7`	`4`	`.clear-button{`
`8`	`5`	`opacity: 0;`
`9`	`6`	`position: absolute;`
`@@ -20,18 +17,15 @@`
`20`	`17`	`&.single .clear-button{`
`21`	`18`
`22`	`19`	`@if variable-exists(select-padding-dropdown-item-x) {`
`23`		`- right: max( var(--ts-pr-caret), #{$select-padding-dropdown-item-x});`
	`20`	`+ right: Max( var(--ts-pr-caret), #{$select-padding-dropdown-item-x});`
`24`	`21`	`}`
`25`	`22`	`@else{`
`26`		`- right: max( var(--ts-pr-caret), calc(#{$select-padding-x} - #{$select-padding-item-x}) );`
	`23`	`+ right: Max( var(--ts-pr-caret), calc(#{$select-padding-x} - #{$select-padding-item-x}) );`
`27`	`24`	`}`
`28`	`25`	`}`
`29`	`26`
`30`	`27`	`&.focus.has-items .clear-button,`
`31`	`28`	`&:not(.disabled):hover.has-items .clear-button{`
`32`	`29`	`opacity: 1;`
`33`	`30`	`}`
`34`		`-`
`35`		`-`
`36`		`-`
`37`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ $select-spinner-border-color: $select-color-border !default;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`.#{$select-ns}-control {`
`102`		`- padding-right: max( var(--ts-pr-min), calc( var(--ts-pr-clear-button) + var(--ts-pr-caret)) ) !important;`
	`102`	`+ padding-right: Max( var(--ts-pr-min), calc( var(--ts-pr-clear-button) + var(--ts-pr-caret)) ) !important;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`@mixin ts-caret(){`