@clayui/css 3.60.2 → 3.62.1

package/src/scss/mixins/_dropdown-menu.scss

@@ -459,13 +459,14 @@
 		$c-inner: map-merge(
 			(
 				enabled:
-					setter(
+					if(
+						variable-exists(enable-c-inner),
+						$enable-c-inner,
 						if(
-							variable-exists(enable-c-inner),
-							$enable-c-inner,
-							$cadmin-enable-c-inner
-						),
-						true
+							variable-exists(cadmin-enable-c-inner),
+							$cadmin-enable-c-inner,
+							true
+						)
 					),
 				flex-grow: 1,
 				margin-bottom: math-sign(map-get($map, padding-bottom)),

package/src/scss/mixins/_forms.scss

@@ -248,6 +248,15 @@
 /// 			// .form-control.disabled ~ .input-group-inset-item
 /// 		),
 /// 	),
+/// 	inline-item: (
+///			// .form-control .inline-item
+/// 	),
+/// 	label: (
+/// 		// .form-control .label
+/// 	),
+/// 	form-control-inset: (
+///			// .form-control .form-control-inset
+/// 	),
 /// )
 /// -=-=-=-=-=- Deprecated -=-=-=-=-=-
 /// placeholder-color: {Color | String | Null}, // deprecated after 3.7.0
@@ -602,6 +611,20 @@
 				}
 			}
 
+			.inline-item {
+				@include clay-css(map-get($map, inline-item));
+			}
+
+			.label {
+				@include clay-css(map-get($map, label));
+			}
+
+			.form-control-inset {
+				@include clay-form-control-variant(
+					map-get($map, form-control-inset)
+				);
+			}
+
 			@include clay-generate-media-breakpoints($map);
 		}
 	}
@@ -708,7 +731,11 @@
 					if(
 						variable-exists(input-color),
 						$input-color,
-						$cadmin-input-color
+						if(
+							variable-exists(cadmin-input-color),
+							$cadmin-input-color,
+							null
+						)
 					)
 				),
 		)

package/src/scss/mixins/_gradients.scss

@@ -8,22 +8,28 @@
 
 @mixin gradient-bg($color) {
 	@if (
-		setter(
+		if(
+			variable-exists(enable-gradients),
+			$enable-gradients,
 			if(
-				variable-exists(enable-gradients),
-				$enable-gradients,
-				$cadmin-enable-gradients
-			),
-			false
+				variable-exists(cadmin-enable-gradients),
+				$cadmin-enable-gradients,
+				false
+			)
 		)
 	) {
 		background: $color
 			linear-gradient(
 				180deg,
 				clay-mix(
-					setter(
-						if(variable-exists(body-bg), $body-bg, $cadmin-body-bg),
-						#fff
+					if(
+						variable-exists(body-bg),
+						$body-bg,
+						if(
+							variable-exists(cadmin-body-bg),
+							$cadmin-body-bg,
+							#fff
+						)
 					),
 					$color,
 					15%

package/src/scss/mixins/_grid.scss

@@ -117,13 +117,14 @@
 	$custom-grid-props: map-merge(
 		(
 			enabled:
-				setter(
+				if(
+					variable-exists(enable-grid-classes),
+					$enable-grid-classes,
 					if(
-						variable-exists(enable-grid-classes),
-						$enable-grid-classes,
-						$cadmin-enable-grid-classes
-					),
-					true
+						variable-exists(cadmin-enable-grid-classes),
+						$cadmin-enable-grid-classes,
+						true
+					)
 				),
 		),
 		$map

package/src/scss/mixins/_input-groups.scss

@@ -332,12 +332,6 @@
 				@include clay-form-control-variant(
 					map-deep-get($map, form-control)
 				);
-
-				.label {
-					@include clay-label-variant(
-						map-deep-get($map, form-control, label)
-					);
-				}
 			}
 
 			> .form-file {

package/src/scss/mixins/_labels.scss

@@ -40,7 +40,11 @@
 					if(
 						variable-exists(label-border-width),
 						$label-border-width,
-						$cadmin-label-border-width
+						if(
+							variable-exists(cadmin-label-border-width),
+							$cadmin-label-border-width,
+							null
+						)
 					)
 				),
 			padding-bottom:
@@ -157,13 +161,14 @@
 		$c-inner,
 		(
 			enabled:
-				setter(
+				if(
+					variable-exists(enable-c-inner),
+					$enable-c-inner,
 					if(
-						variable-exists(enable-c-inner),
-						$enable-c-inner,
-						$cadmin-enable-c-inner
-					),
-					true
+						variable-exists(cadmin-enable-c-inner),
+						$cadmin-enable-c-inner,
+						true
+					)
 				),
 			margin-bottom:
 				setter(

package/src/scss/mixins/_links.scss

@@ -532,13 +532,14 @@
 		$c-inner: map-merge(
 			(
 				enabled:
-					setter(
+					if(
+						variable-exists(enable-c-inner),
+						$enable-c-inner,
 						if(
-							variable-exists(enable-c-inner),
-							$enable-c-inner,
-							$cadmin-enable-c-inner
-						),
-						true
+							variable-exists(cadmin-enable-c-inner),
+							$cadmin-enable-c-inner,
+							true
+						)
 					),
 				margin-bottom: math-sign(map-get($map, padding-bottom)),
 				margin-left: math-sign(map-get($map, padding-left)),

package/src/scss/mixins/_list-group.scss

@@ -68,7 +68,11 @@
 		if(
 			variable-exists(list-group-bg),
 			$list-group-bg,
-			$cadmin-list-group-bg
+			if(
+				variable-exists(cadmin-list-group-bg),
+				$cadmin-list-group-bg,
+				null
+			)
 		)
 	);
 	$border-bottom-color: setter(
@@ -76,7 +80,13 @@
 		if(
 			variable-exists(list-group-notification-item-border-bottom-color),
 			$list-group-notification-item-border-bottom-color,
-			$cadmin-list-group-notification-item-border-bottom-color
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-border-bottom-color
+				),
+				$cadmin-list-group-notification-item-border-bottom-color,
+				null
+			)
 		)
 	);
 	$border-left-color: setter(
@@ -84,7 +94,13 @@
 		if(
 			variable-exists(list-group-notification-item-border-left-color),
 			$list-group-notification-item-border-left-color,
-			$cadmin-list-group-notification-item-border-left-color
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-border-left-color
+				),
+				$cadmin-list-group-notification-item-border-left-color,
+				null
+			)
 		)
 	);
 	$border-right-color: setter(
@@ -92,7 +108,13 @@
 		if(
 			variable-exists(list-group-notification-item-border-right-color),
 			$list-group-notification-item-border-right-color,
-			$cadmin-list-group-notification-item-border-right-color
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-border-right-color
+				),
+				$cadmin-list-group-notification-item-border-right-color,
+				null
+			)
 		)
 	);
 	$border-top-color: setter(
@@ -100,7 +122,13 @@
 		if(
 			variable-exists(list-group-notification-item-border-top-color),
 			$list-group-notification-item-border-top-color,
-			$cadmin-list-group-notification-item-border-top-color
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-border-top-color
+				),
+				$cadmin-list-group-notification-item-border-top-color,
+				null
+			)
 		)
 	);
 
@@ -109,7 +137,13 @@
 		if(
 			variable-exists(list-group-notification-item-border-bottom-width),
 			$list-group-notification-item-border-bottom-width,
-			$cadmin-list-group-notification-item-border-bottom-width
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-border-bottom-width
+				),
+				$cadmin-list-group-notification-item-border-bottom-width,
+				null
+			)
 		)
 	);
 	$border-left-width: setter(
@@ -117,7 +151,13 @@
 		if(
 			variable-exists(list-group-notification-item-border-left-width),
 			$list-group-notification-item-border-left-width,
-			$cadmin-list-group-notification-item-border-left-width
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-border-left-width
+				),
+				$cadmin-list-group-notification-item-border-left-width,
+				null
+			)
 		)
 	);
 	$border-right-width: setter(
@@ -125,7 +165,13 @@
 		if(
 			variable-exists(list-group-notification-item-border-right-width),
 			$list-group-notification-item-border-right-width,
-			$cadmin-list-group-notification-item-border-right-width
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-border-right-width
+				),
+				$cadmin-list-group-notification-item-border-right-width,
+				null
+			)
 		)
 	);
 	$border-top-width: setter(
@@ -133,7 +179,13 @@
 		if(
 			variable-exists(list-group-notification-item-border-top-width),
 			$list-group-notification-item-border-top-width,
-			$cadmin-list-group-notification-item-border-top-width
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-border-top-width
+				),
+				$cadmin-list-group-notification-item-border-top-width,
+				null
+			)
 		)
 	);
 
@@ -149,7 +201,11 @@
 		if(
 			variable-exists(list-group-active-bg),
 			$list-group-active-bg,
-			$cadmin-list-group-active-bg
+			if(
+				variable-exists(cadmin-list-group-active-bg),
+				$cadmin-list-group-active-bg,
+				null
+			)
 		)
 	);
 	$active-border-bottom-color: setter(
@@ -159,7 +215,13 @@
 				list-group-notification-item-active-border-bottom-color
 			),
 			$list-group-notification-item-active-border-bottom-color,
-			$cadmin-list-group-notification-item-active-border-bottom-color
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-active-border-bottom-color
+				),
+				$cadmin-list-group-notification-item-active-border-bottom-color,
+				null
+			)
 		)
 	);
 	$active-border-left-color: setter(
@@ -169,7 +231,13 @@
 				list-group-notification-item-active-border-left-color
 			),
 			$list-group-notification-item-active-border-left-color,
-			$cadmin-list-group-notification-item-active-border-left-color
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-active-border-left-color
+				),
+				$cadmin-list-group-notification-item-active-border-left-color,
+				null
+			)
 		)
 	);
 	$active-border-right-color: setter(
@@ -179,7 +247,13 @@
 				list-group-notification-item-active-border-right-color
 			),
 			$list-group-notification-item-active-border-right-color,
-			$cadmin-list-group-notification-item-active-border-right-color
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-active-border-right-color
+				),
+				$cadmin-list-group-notification-item-active-border-right-color,
+				null
+			)
 		)
 	);
 	$active-border-top-color: setter(
@@ -189,7 +263,13 @@
 				list-group-notification-item-active-border-top-color
 			),
 			$list-group-notification-item-active-border-top-color,
-			$cadmin-list-group-notification-item-active-border-top-color
+			if(
+				variable-exists(
+					cadmin-list-group-notification-item-active-border-top-color
+				),
+				$cadmin-list-group-notification-item-active-border-top-color,
+				null
+			)
 		)
 	);
 
@@ -208,13 +288,14 @@
 	background-color: $bg;
 
 	@if (
-		setter(
+		if(
+			variable-exists(enable-rounded),
+			$enable-rounded,
 			if(
-				variable-exists(enable-rounded),
-				$enable-rounded,
-				$cadmin-enable-rounded
-			),
-			true
+				variable-exists(cadmin-enable-rounded),
+				$cadmin-enable-rounded,
+				true
+			)
 		)
 	) {
 		border-bottom-left-radius: $border-bottom-left-radius;

package/src/scss/mixins/_menubar.scss

@@ -288,13 +288,14 @@
 		$_toggler-mobile-c-inner,
 		(
 			enabled:
-				setter(
+				if(
+					variable-exists(enable-c-inner),
+					$enable-c-inner,
 					if(
-						variable-exists(enable-c-inner),
-						$enable-c-inner,
-						$cadmin-enable-c-inner
-					),
-					true
+						variable-exists(cadmin-enable-c-inner),
+						$cadmin-enable-c-inner,
+						true
+					)
 				),
 			margin-bottom:
 				setter(
@@ -537,7 +538,11 @@
 					if(
 						variable-exists(navbar-light-color),
 						$navbar-light-color,
-						$cadmin-navbar-light-color
+						if(
+							variable-exists(cadmin-navbar-light-color),
+							$cadmin-navbar-light-color,
+							null
+						)
 					)
 				),
 			hover: (
@@ -553,7 +558,13 @@
 						if(
 							variable-exists(navbar-light-hover-color),
 							$navbar-light-hover-color,
-							$cadmin-navbar-light-hover-color
+							if(
+								variable-exists(
+									cadmin-navbar-light-hover-color
+								),
+								$cadmin-navbar-light-hover-color,
+								null
+							)
 						)
 					),
 			),
@@ -570,7 +581,13 @@
 						if(
 							variable-exists(navbar-light-active-color),
 							$navbar-light-active-color,
-							$cadmin-navbar-light-active-color
+							if(
+								variable-exists(
+									cadmin-navbar-light-active-color
+								),
+								$cadmin-navbar-light-active-color,
+								null
+							)
 						)
 					),
 			),
@@ -594,7 +611,13 @@
 						if(
 							variable-exists(navbar-light-disabled-color),
 							$navbar-light-disabled-color,
-							$cadmin-navbar-light-disabled-color
+							if(
+								variable-exists(
+									cadmin-navbar-light-disabled-color
+								),
+								$cadmin-navbar-light-disabled-color,
+								null
+							)
 						)
 					),
 			),
@@ -621,7 +644,11 @@
 					if(
 						variable-exists(dropdown-link-color),
 						$dropdown-link-color,
-						$cadmin-dropdown-link-color
+						if(
+							variable-exists(cadmin-dropdown-link-color),
+							$cadmin-dropdown-link-color,
+							null
+						)
 					)
 				),
 			hover: (
@@ -632,7 +659,11 @@
 						if(
 							variable-exists(dropdown-link-hover-bg),
 							$dropdown-link-hover-bg,
-							$cadmin-dropdown-link-hover-bg
+							if(
+								variable-exists(cadmin-dropdown-link-hover-bg),
+								$cadmin-dropdown-link-hover-bg,
+								null
+							)
 						)
 					),
 				color:
@@ -642,7 +673,13 @@
 						if(
 							variable-exists(dropdown-link-hover-color),
 							$dropdown-link-hover-color,
-							$cadmin-dropdown-link-hover-color
+							if(
+								variable-exists(
+									cadmin-dropdown-link-hover-color
+								),
+								$cadmin-dropdown-link-hover-color,
+								null
+							)
 						)
 					),
 			),
@@ -654,7 +691,11 @@
 						if(
 							variable-exists(dropdown-link-active-bg),
 							$dropdown-link-active-bg,
-							$cadmin-dropdown-link-active-bg
+							if(
+								variable-exists(cadmin-dropdown-link-active-bg),
+								$cadmin-dropdown-link-active-bg,
+								null
+							)
 						)
 					),
 				color:
@@ -664,7 +705,13 @@
 						if(
 							variable-exists(dropdown-link-active-color),
 							$dropdown-link-active-color,
-							$cadmin-dropdown-link-active-color
+							if(
+								variable-exists(
+									cadmin-dropdown-link-active-color
+								),
+								$cadmin-dropdown-link-active-color,
+								null
+							)
 						)
 					),
 			),
@@ -676,7 +723,13 @@
 						if(
 							variable-exists(dropdown-link-active-font-weight),
 							$dropdown-link-active-font-weight,
-							$cadmin-dropdown-link-active-font-weight
+							if(
+								variable-exists(
+									cadmin-dropdown-link-active-font-weight
+								),
+								$cadmin-dropdown-link-active-font-weight,
+								null
+							)
 						)
 					),
 			),
@@ -694,7 +747,13 @@
 						if(
 							variable-exists(dropdown-link-disabled-color),
 							$dropdown-link-disabled-color,
-							$cadmin-dropdown-link-disabled-color
+							if(
+								variable-exists(
+									cadmin-dropdown-link-disabled-color
+								),
+								$cadmin-dropdown-link-disabled-color,
+								null
+							)
 						)
 					),
 			),
@@ -716,7 +775,11 @@
 					if(
 						variable-exists(dropdown-bg),
 						$dropdown-bg,
-						$cadmin-dropdown-bg
+						if(
+							variable-exists(cadmin-dropdown-bg),
+							$cadmin-dropdown-bg,
+							null
+						)
 					)
 				),
 			border-color:
@@ -726,7 +789,11 @@
 					if(
 						variable-exists(dropdown-border-color),
 						$dropdown-border-color,
-						$cadmin-dropdown-border-color
+						if(
+							variable-exists(cadmin-dropdown-border-color),
+							$cadmin-dropdown-border-color,
+							null
+						)
 					)
 				),
 			border-radius:
@@ -736,7 +803,11 @@
 					if(
 						variable-exists(border-radius),
 						$border-radius,
-						$cadmin-border-radius
+						if(
+							variable-exists(cadmin-border-radius),
+							$cadmin-border-radius,
+							null
+						)
 					)
 				),
 			border-style:
@@ -751,7 +822,11 @@
 					if(
 						variable-exists(dropdown-box-shadow),
 						$dropdown-box-shadow,
-						$cadmin-dropdown-box-shadow
+						if(
+							variable-exists(cadmin-dropdown-box-shadow),
+							$cadmin-dropdown-box-shadow,
+							null
+						)
 					)
 				),
 		)