@daffodil/design 0.84.0 → 0.86.0

package/button/src/button/basic/button-theme.scss

@@ -1,6 +1,4 @@
-@use 'sass:map';
-@use '../../../../scss/theming';
-@use '../../../../scss/core';
+@use '../../../../scss/theming' as *;
 
 @mixin daff-button-theme-variant(
 	$base-color,
@@ -8,18 +6,18 @@
 	$active-color: $hover-color
 ) {
 	background-color: $base-color;
-	color: theming.daff-text-contrast($base-color);
+	color: daff-text-contrast($base-color);
 
 	&::after {
 		background: $hover-color;
 	}
 
 	&:hover {
-		color: theming.daff-text-contrast($hover-color);
+		color: daff-text-contrast($hover-color);
 	}
 
 	&:active {
-		color: theming.daff-text-contrast($active-color);
+		color: daff-text-contrast($active-color);
 
 		&::after {
 			background: $active-color;
@@ -28,193 +26,193 @@
 }
 
 @mixin daff-button-theme($theme) {
-	$primary: core.daff-map-get($theme, primary);
-	$secondary: core.daff-map-get($theme, secondary);
-	$tertiary: core.daff-map-get($theme, tertiary);
-	$info: core.daff-map-get($theme, informational);
-	$warn: core.daff-map-get($theme, warn);
-	$critical: core.daff-map-get($theme, critical);
-	$success: core.daff-map-get($theme, success);
-	$base: core.daff-map-get($theme, 'core', 'base');
-	$base-contrast: core.daff-map-get($theme, 'core', 'base-contrast');
-	$white: core.daff-map-get($theme, 'core', 'white');
-	$black: core.daff-map-get($theme, 'core', 'black');
-	$neutral: core.daff-map-get($theme, 'core', 'neutral');
-	$type: core.daff-map-get($theme, 'core', 'type');
+	$primary: daff-get-palette($theme, primary);
+	$secondary: daff-get-palette($theme, secondary);
+	$tertiary: daff-get-palette($theme, tertiary);
+	$info: daff-get-palette($theme, informational);
+	$warn: daff-get-palette($theme, warn);
+	$critical: daff-get-palette($theme, critical);
+	$success: daff-get-palette($theme, success);
+	$neutral: daff-get-palette($theme, neutral);
+	$base: daff-get-base-color($theme, base);
+	$base-contrast: daff-get-base-color($theme, base-contrast);
+	$white: daff-get-base-color($theme, 'white');
+	$black: daff-get-base-color($theme, 'black');
+	$mode: daff-get-theme-mode($theme);
 
 	.daff-button {
-		@include theming.light($type) {
+		@include light($mode) {
 			@include daff-button-theme-variant(
-				theming.daff-color($neutral, 10),
-				theming.daff-color($neutral, 20),
-				theming.daff-color($neutral, 30)
+				daff-color($neutral, 10),
+				daff-color($neutral, 20),
+				daff-color($neutral, 30)
 			);
 
 			&.daff-primary {
 				@include daff-button-theme-variant(
-					theming.daff-color($primary),
-					theming.daff-color($primary, 70),
-					theming.daff-color($primary, 80)
+					daff-color($primary),
+					daff-color($primary, 70),
+					daff-color($primary, 80)
 				);
 			}
 
 			&.daff-secondary {
 				@include daff-button-theme-variant(
-					theming.daff-color($secondary),
-					theming.daff-color($secondary, 70),
-					theming.daff-color($secondary, 80)
+					daff-color($secondary),
+					daff-color($secondary, 70),
+					daff-color($secondary, 80)
 				);
 			}
 
 			&.daff-tertiary {
 				@include daff-button-theme-variant(
-					theming.daff-color($tertiary),
-					theming.daff-color($tertiary, 70),
-					theming.daff-color($tertiary, 80)
+					daff-color($tertiary),
+					daff-color($tertiary, 70),
+					daff-color($tertiary, 80)
 				);
 			}
 
 			&.daff-dark {
 				@include daff-button-theme-variant(
-					theming.daff-color($neutral, 100),
-					theming.daff-color($neutral, 90),
-					theming.daff-color($neutral, 80)
+					daff-color($neutral, 100),
+					daff-color($neutral, 90),
+					daff-color($neutral, 80)
 				);
 			}
 
 			&.daff-light {
 				@include daff-button-theme-variant(
-					theming.daff-color($neutral, 10),
-					theming.daff-color($neutral, 20),
-					theming.daff-color($neutral, 30)
+					daff-color($neutral, 10),
+					daff-color($neutral, 20),
+					daff-color($neutral, 30)
 				);
 			}
 
 			&.daff-theme {
 				@include daff-button-theme-variant(
 					$base,
-					theming.daff-color($neutral, 20),
-					theming.daff-color($neutral, 30)
+					daff-color($neutral, 20),
+					daff-color($neutral, 30)
 				);
 			}
 
 			&.daff-theme-contrast {
 				@include daff-button-theme-variant(
 					$base-contrast,
-					theming.daff-color($neutral, 90),
-					theming.daff-color($neutral, 80)
+					daff-color($neutral, 90),
+					daff-color($neutral, 80)
 				);
 			}
 
 			&.daff-warn {
 				@include daff-button-theme-variant(
-					theming.daff-color($warn),
-					theming.daff-color($warn, 70),
-					theming.daff-color($warn, 80)
+					daff-color($warn),
+					daff-color($warn, 70),
+					daff-color($warn, 80)
 				);
 			}
 
 			&.daff-success {
 				@include daff-button-theme-variant(
-					theming.daff-color($success),
-					theming.daff-color($success, 70),
-					theming.daff-color($success, 80)
+					daff-color($success),
+					daff-color($success, 70),
+					daff-color($success, 80)
 				);
 			}
 
 			&.daff-critical {
 				@include daff-button-theme-variant(
-					theming.daff-color($critical),
-					theming.daff-color($critical, 70),
-					theming.daff-color($critical, 80)
+					daff-color($critical),
+					daff-color($critical, 70),
+					daff-color($critical, 80)
 				);
 			}
 		}
 
-		@include theming.dark($type) {
+		@include dark($mode) {
 			@include daff-button-theme-variant(
-				theming.daff-color($neutral, 90),
-				theming.daff-color($neutral, 80),
-				theming.daff-color($neutral, 70)
+				daff-color($neutral, 90),
+				daff-color($neutral, 80),
+				daff-color($neutral, 70)
 			);
 
 			&.daff-primary {
 				@include daff-button-theme-variant(
-					theming.daff-color($primary),
-					theming.daff-color($primary, 40),
-					theming.daff-color($primary, 30)
+					daff-color($primary),
+					daff-color($primary, 40),
+					daff-color($primary, 30)
 				);
 			}
 
 			&.daff-secondary {
 				@include daff-button-theme-variant(
-					theming.daff-color($secondary),
-					theming.daff-color($secondary, 40),
-					theming.daff-color($secondary, 30)
+					daff-color($secondary),
+					daff-color($secondary, 40),
+					daff-color($secondary, 30)
 				);
 			}
 
 			&.daff-tertiary {
 				@include daff-button-theme-variant(
-					theming.daff-color($tertiary),
-					theming.daff-color($tertiary, 40),
-					theming.daff-color($tertiary, 30)
+					daff-color($tertiary),
+					daff-color($tertiary, 40),
+					daff-color($tertiary, 30)
 				);
 			}
 
 			&.daff-dark {
 				@include daff-button-theme-variant(
-					theming.daff-color($neutral, 100),
-					theming.daff-color($neutral, 90),
-					theming.daff-color($neutral, 80)
+					daff-color($neutral, 100),
+					daff-color($neutral, 90),
+					daff-color($neutral, 80)
 				);
 			}
 
 			&.daff-light {
 				@include daff-button-theme-variant(
 					$white,
-					theming.daff-color($neutral, 20),
-					theming.daff-color($neutral, 30)
+					daff-color($neutral, 20),
+					daff-color($neutral, 30)
 				);
 			}
 
 			&.daff-theme {
 				@include daff-button-theme-variant(
 					$base,
-					theming.daff-color($neutral, 90),
-					theming.daff-color($neutral, 80)
+					daff-color($neutral, 90),
+					daff-color($neutral, 80)
 				);
 			}
 
 			&.daff-theme-contrast {
 				@include daff-button-theme-variant(
 					$base-contrast,
-					theming.daff-color($neutral, 20),
-					theming.daff-color($neutral, 30)
+					daff-color($neutral, 20),
+					daff-color($neutral, 30)
 				);
 			}
 
 			&.daff-warn {
 				@include daff-button-theme-variant(
-					theming.daff-color($warn),
-					theming.daff-color($warn, 40),
-					theming.daff-color($warn, 30)
+					daff-color($warn),
+					daff-color($warn, 40),
+					daff-color($warn, 30)
 				);
 			}
 
 			&.daff-success {
 				@include daff-button-theme-variant(
-					theming.daff-color($success),
-					theming.daff-color($success, 40),
-					theming.daff-color($success, 30)
+					daff-color($success),
+					daff-color($success, 40),
+					daff-color($success, 30)
 				);
 			}
 
 			&.daff-critical {
 				@include daff-button-theme-variant(
-					theming.daff-color($critical),
-					theming.daff-color($critical, 40),
-					theming.daff-color($critical, 30)
+					daff-color($critical),
+					daff-color($critical, 40),
+					daff-color($critical, 30)
 				);
 			}
 		}

package/button/src/button/button-base.scss

@@ -47,12 +47,6 @@
 		z-index: 1;
 	}
 
-	.daff-button__loading {
-		> * {
-			width: 100%;
-		}
-	}
-
 	.daff-button__content {
 		@include t.text-truncate();
 	}
@@ -87,10 +81,6 @@
 		line-height: 2rem;
 		height: 2rem;
 		padding: 0 1rem;
-
-		.daff-button__loading {
-			width: 1rem;
-		}
 	}
 
 	&.daff-md {
@@ -98,10 +88,6 @@
 		line-height: 3rem;
 		height: 3rem;
 		padding: 0 1.5rem;
-
-		.daff-button__loading {
-			width: 1.5rem;
-		}
 	}
 
 	&.daff-lg {
@@ -109,9 +95,5 @@
 		line-height: 3.5rem;
 		height: 3.5rem;
 		padding: 0 1.5rem;
-
-		.daff-button__loading {
-			width: 2rem;
-		}
 	}
 }

package/button/src/button/flat/flat-theme.scss

@@ -1,6 +1,4 @@
-@use 'sass:map';
-@use '../../../../scss/theming';
-@use '../../../../scss/core';
+@use '../../../../scss/theming' as *;
 
 @mixin daff-flat-button-theme-variant($base-color) {
 	color: $base-color;
@@ -17,41 +15,41 @@
 }
 
 @mixin daff-flat-button-theme($theme) {
-	$primary: core.daff-map-get($theme, primary);
-	$secondary: core.daff-map-get($theme, secondary);
-	$tertiary: core.daff-map-get($theme, tertiary);
-	$info: core.daff-map-get($theme, informational);
-	$warn: core.daff-map-get($theme, warn);
-	$critical: core.daff-map-get($theme, critical);
-	$success: core.daff-map-get($theme, success);
-	$base: core.daff-map-get($theme, 'core', 'base');
-	$base-contrast: core.daff-map-get($theme, 'core', 'base-contrast');
-	$white: core.daff-map-get($theme, 'core', 'white');
-	$black: core.daff-map-get($theme, 'core', 'black');
-	$neutral: core.daff-map-get($theme, 'core', 'neutral');
-	$type: core.daff-map-get($theme, 'core', 'type');
+	$primary: daff-get-palette($theme, primary);
+	$secondary: daff-get-palette($theme, secondary);
+	$tertiary: daff-get-palette($theme, tertiary);
+	$info: daff-get-palette($theme, informational);
+	$warn: daff-get-palette($theme, warn);
+	$critical: daff-get-palette($theme, critical);
+	$success: daff-get-palette($theme, success);
+	$base: daff-get-base-color($theme, base);
+	$base-contrast: daff-get-base-color($theme, base-contrast);
+	$white: daff-get-base-color($theme, 'white');
+	$black: daff-get-base-color($theme, 'black');
+	$neutral: daff-get-palette($theme, neutral);
+	$mode: daff-get-theme-mode($theme);
 
 	.daff-flat-button {
-		@include theming.light($type) {
+		@include light($mode) {
 			@include daff-flat-button-theme-variant(
 				$base-contrast,
 			);
 
 			&.daff-primary {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($primary),
+					daff-color($primary),
 				);
 			}
 
 			&.daff-secondary {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($secondary),
+					daff-color($secondary),
 				);
 			}
 
 			&.daff-tertiary {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($tertiary)
+					daff-color($tertiary)
 				);
 			}
 
@@ -81,43 +79,43 @@
 
 			&.daff-warn {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($warn)
+					daff-color($warn)
 				);
 			}
 
 			&.daff-critical {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($critical)
+					daff-color($critical)
 				);
 			}
 
 			&.daff-success {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($success)
+					daff-color($success)
 				);
 			}
 		}
 
-		@include theming.dark($type) {
+		@include dark($mode) {
 			@include daff-flat-button-theme-variant(
 				$base-contrast,
 			);
 
 			&.daff-primary {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($primary, 40),
+					daff-color($primary, 40),
 				);
 			}
 
 			&.daff-secondary {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($secondary, 40),
+					daff-color($secondary, 40),
 				);
 			}
 
 			&.daff-tertiary {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($tertiary, 40)
+					daff-color($tertiary, 40)
 				);
 			}
 
@@ -147,19 +145,19 @@
 
 			&.daff-warn {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($warn, 40)
+					daff-color($warn, 40)
 				);
 			}
 
 			&.daff-critical {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($critical, 40)
+					daff-color($critical, 40)
 				);
 			}
 
 			&.daff-success {
 				@include daff-flat-button-theme-variant(
-					theming.daff-color($success, 40)
+					daff-color($success, 40)
 				);
 			}
 		}