Deprecated xs breakpoint

zaydek · Nov 21, 2020 · 6c273c0 · 6c273c0
1 parent 5bd0a22
commit 6c273c0
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 61 deletions.
diff --git a/src/duomo/builder.scss b/src/duomo/builder.scss
@@ -17,68 +17,53 @@ $__zero-range: (0);
 $__full-range: list.join($negative-range, $standard-range);
 
 @mixin duomo {
-	// OK
-	// @include group;
-	// @include display;
-
-	// @include stack-from-range($range: $standard-range, $resolver: rem);
-
-	// OK
-	// @include grid-from-range($range: $standard-range, $resolver: rem);
-
-	// OK
-	// @include margin-from-range($range: $__full-range, $resolver: rem);
-	// @include padding-from-range($range: $standard-range, $resolver: rem);
-	// @include position-from-range($range: $__zero-range, $resolver: rem);
-	// @include tooltip;
-	// @include width-from-range($range: $standard-range, $resolver: rem);
-	// @include max-width-from-breakpoint-map($breakpoint-map: $breakpoint-map);
-	// @include height-from-range($range: $standard-range, $resolver: rem);
-	// @include min-height;
-
-	// @include whitespace;
-	// @include text-align;
-	// @include font-weight;
-	// @include font-size-from-range($range: $font-size-range, $resolver: rem);
-	// @include letter-spacing($range: $letter-spacing-range, $resolver: em);
-	// @include line-height-from-range($range: $line-height-range);
-	// @include text-decoration;
-	// @include color-from-map($map: $color-map, $opacity-range: $opacity-range);
-	// @include background-color-from-map($map: $color-map, $opacity-range: $opacity-range);
-
-	// OK
-	// @include border-width-from-range($range: $border-width-range, $resolver: rem);
-	// @include border-color-from-map($map: $color-map, $opacity-range: $opacity-range);
-	// @include border-radius-from-range($range: $border-radius-range, $resolver: rem);
-
-	// @include box-shadow-from-map($map: $shadow-map);
-
-	// TODO
-	// @include opacity-from-range($opacity-range: $opacity-range);
-
-	// @include overflow;
-	// @include z-index-from-range($range: $z-index-range);
-
-	// CHECK
-	// @include pointer-events;
+	@include group;
+	@include display;
+	@include stack-from-range($range: $standard-range, $resolver: rem);
+	@include grid-from-range($range: $standard-range, $resolver: rem);
+	@include margin-from-range($range: $__full-range, $resolver: rem);
+	@include padding-from-range($range: $standard-range, $resolver: rem);
+	@include position-from-range($range: $__zero-range, $resolver: rem);
+	@include tooltip;
+	@include width-from-range($range: $standard-range, $resolver: rem);
+	@include max-width-from-breakpoint-map($breakpoint-map: $breakpoint-map);
+	@include height-from-range($range: $standard-range, $resolver: rem);
+	@include min-height;
+	@include whitespace;
+	@include text-align;
+	@include font-weight;
+	@include font-size-from-range($range: $font-size-range, $resolver: rem);
+	@include letter-spacing($range: $letter-spacing-range, $resolver: em);
+	@include line-height-from-range($range: $line-height-range);
+	@include text-decoration;
+	@include color-from-map($map: $color-map, $opacity-range: $opacity-range);
+	@include background-color-from-map($map: $color-map, $opacity-range: $opacity-range);
+	@include border-width-from-range($range: $border-width-range, $resolver: rem);
+	@include border-color-from-map($map: $color-map, $opacity-range: $opacity-range);
+	@include border-radius-from-range($range: $border-radius-range, $resolver: rem);
+	@include box-shadow-from-map($map: $shadow-map);
+	@include opacity-from-range($opacity-range: $opacity-range);
+	@include overflow;
+	@include z-index-from-range($range: $z-index-range);
+	@include pointer-events;
 	@include transition($default-duration: 300ms, $default-timing-function: $ease-out);
-	// @include transition-duration-from-range($range: range(0, 1000, 100));
-	// @include transition-timing-function-from-map($map: $timing-map);
+	@include transition-duration-from-range($range: range(0, 1000, 100));
+	@include transition-timing-function-from-map($map: $timing-map);
 }
 
 @at-root {
 	@if not $headless {
-		// /*! @zaydek/duomo | MIT License | https://github.com/zaydek/duomo */
-		// @include preflight;
+		/*! @zaydek/duomo | MIT License | https://github.com/zaydek/duomo */
+		@include preflight;
 		@include duomo;
-		// @each $k, $v in $breakpoint-map {
-		// 	@media (min-width: px($v)) {
-		// 		.#{escape-media-key($k)} {
-		// 			@at-root {
-		// 				@include duomo;
-		// 			}
-		// 		}
-		// 	}
-		// }
+		@each $k, $v in $breakpoint-map {
+			@media (min-width: px($v)) {
+				.#{escape-media-key($k)} {
+					@at-root {
+						@include duomo;
+					}
+				}
+			}
+		}
 	}
 }
diff --git a/src/duomo/configuration/maps/breakpoint-map.scss b/src/duomo/configuration/maps/breakpoint-map.scss
@@ -1,11 +1,9 @@
-$xs: 32 * 16 !default; // ->  512
 $sm: 40 * 16 !default; // ->  640
 $md: 48 * 16 !default; // ->  768
 $lg: 64 * 16 !default; // -> 1024
 $xl: 80 * 16 !default; // -> 1280
 
 $breakpoint-map: (
-	"xs": $xs,
 	"sm": $sm,
 	"md": $md,
 	"lg": $lg,

diff --git a/src/duomo/configuration/ranges.scss b/src/duomo/configuration/ranges.scss
@@ -49,9 +49,9 @@ $letter-spacing-range: (
 
 // prettier-ignore
 $line-height-range: meta-range(
-	(1, 2, 0.5),
+	(1, 2, 0.05),
 
-	1,
+	2,
 ) !default;
 
 // prettier-ignore