Renamed generate-colors-from-map to generate-opaque-colors-from-map b…

…ecause of alpha channel
zaydek · Nov 16, 2020 · 55bff93 · 55bff93
1 parent 8eeccdc
commit 55bff93
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/src/duomo/core/background-color.scss b/src/duomo/core/background-color.scss
@@ -2,7 +2,7 @@
 
 @mixin background-color-from-map($map, $opacity-range) {
 	// prettier-ignore
-	@include helpers.generate-colors-from-map(
+	@include helpers.generate-opaque-colors-from-map(
 		"bg",
 		background-color,
 		$map,

diff --git a/src/duomo/core/border.scss b/src/duomo/core/border.scss
@@ -31,7 +31,7 @@
 // TODO: Rename to `generate-opaque-colors-from-map`.
 @mixin border-color-from-map($map, $opacity-range) {
 	// prettier-ignore
-	@include helpers.generate-colors-from-map(
+	@include helpers.generate-opaque-colors-from-map(
 		"border",
 		border-color,
 		$map,

diff --git a/src/duomo/core/color.scss b/src/duomo/core/color.scss
@@ -2,7 +2,7 @@
 
 @mixin color-from-map($map, $opacity-range) {
 	// prettier-ignore
-	@include helpers.generate-colors-from-map(
+	@include helpers.generate-opaque-colors-from-map(
 		"text",
 		color,
 		$map,

diff --git a/...nerators.generate-colors-from-map.test.ts → ...s.generate-opaque-colors-from-map.test.ts b/...nerators.generate-colors-from-map.test.ts → ...s.generate-opaque-colors-from-map.test.ts
@@ -16,7 +16,7 @@ $color-map: (
 );
 
 @at-root {
-	@include generate-colors-from-map(
+	@include generate-opaque-colors-from-map(
 		$shorthand: "text",
 		$prop: color,
 		$map: $color-map,

diff --git a/src/duomo/helpers/generators.scss b/src/duomo/helpers/generators.scss
@@ -32,7 +32,7 @@
 	}
 }
 
-@mixin generate-colors-from-map($shorthand, $prop, $map, $opacity-range) {
+@mixin generate-opaque-colors-from-map($shorthand, $prop, $map, $opacity-range) {
 	$amp: get-ampersand();
 
 	@each $k, $v in $map {

diff --git a/src/runtime/AspectRatio.tsx b/src/runtime/AspectRatio.tsx
@@ -14,8 +14,8 @@ interface AspectRatioProps extends React.ComponentProps<"div"> {
 export default function AspectRatio({ aspectRatio, children, ...props }: AspectRatioProps) {
 	return (
 		// prettier-ignore
-		<div className="relative" style={{ paddingBottom: (1 / aspectRatio) * 100 + "%" }} {...props}>
-			<div className="absolute y-0 x-0">
+		<div className="relative" style={{ paddingBottom: 1 / aspectRatio * 100 + "%" }} {...props}>
+			<div className="absolute x-0 y-0">
 				{children}
 			</div>
 		</div>

diff --git a/src/runtime/helpers.ts b/src/runtime/helpers.ts
@@ -1,8 +1,8 @@
 // Ex:
 //
 // rem(16) -> 1rem
-export function rem(n: number): number | string {
-	const floored = Math.floor(n)
+export function rem(px: number): number | string {
+	const floored = Math.floor(px)
 	if (!floored) {
 		return 0
 	}
@@ -12,8 +12,8 @@ export function rem(n: number): number | string {
 // Ex:
 //
 // em(16) -> 1em
-export function em(n: number): number | string {
-	const floored = Math.floor(n)
+export function em(px: number): number | string {
+	const floored = Math.floor(px)
 	if (!floored) {
 		return 0
 	}
@@ -23,8 +23,8 @@ export function em(n: number): number | string {
 // Ex:
 //
 // px(16) -> 16px
-export function px(n: number): number | string {
-	const floored = Math.floor(n)
+export function px(px: number): number | string {
+	const floored = Math.floor(px)
 	if (!floored) {
 		return 0
 	}