WIP

stylescape · Jan 10, 2024 · e7a5ac4 · e7a5ac4
1 parent 62e311d
commit e7a5ac4
Show file tree

Hide file tree

Showing 5 changed files with 158 additions and 55 deletions.
diff --git a/dist/scss/_scale.scss b/dist/scss/_scale.scss
@@ -32,22 +32,6 @@ $line_height_base:  calc($line_height_scalar * $rhythm_base); // Base line heigh
 
 
 
-$basepoint: (
-    1:  basepoint( 1),
-    2:  basepoint( 2),
-    3:  basepoint( 3),
-    4:  basepoint( 4),
-    5:  basepoint( 5),
-    6:  basepoint( 6),
-    7:  basepoint( 7),
-    8:  basepoint( 8),
-    9:  basepoint( 9),
-    10: basepoint(10),
-    11: basepoint(11),
-    12: basepoint(12),
-) !default;
-
-
 // Typography ladder map
 $typographic_scale: (
     1:  q( 4),
@@ -92,6 +76,84 @@ $typographic_scale: (
 
 
 
+// Kyu Point Scale
+// ----------------------------------------------------------------------------
+
+$basepoint_scale: 4;
+
+@function basepoint($value) {
+  @return calc($q * $value * $basepoint_scale);
+}
+
+$basepoint_01: basepoint( 1) !default;
+$basepoint_02: basepoint( 2) !default;
+$basepoint_03: basepoint( 3) !default;
+$basepoint_04: basepoint( 4) !default;
+$basepoint_05: basepoint( 5) !default;
+$basepoint_06: basepoint( 6) !default;
+$basepoint_07: basepoint( 7) !default;
+$basepoint_08: basepoint( 8) !default;
+$basepoint_09: basepoint( 9) !default;
+$basepoint_10: basepoint(10) !default;
+$basepoint_11: basepoint(11) !default;
+$basepoint_12: basepoint(12) !default;
+
+$basepoint: (
+    1:  basepoint( 1),
+    2:  basepoint( 2),
+    3:  basepoint( 3),
+    4:  basepoint( 4),
+    5:  basepoint( 5),
+    6:  basepoint( 6),
+    7:  basepoint( 7),
+    8:  basepoint( 8),
+    9:  basepoint( 9),
+    10: basepoint(10),
+    11: basepoint(11),
+    12: basepoint(12),
+) !default;
+
+
+// Kyu Baseline Scale
+// ----------------------------------------------------------------------------
+
+$baseline_scale: 5;
+
+@function baseline($value) {
+  @return calc($q * $value * $baseline_scale);
+}
+
+$baseline_00: baseline( 1) !default;
+$baseline_01: baseline( 1) !default;
+$baseline_02: baseline( 2) !default;
+$baseline_03: baseline( 3) !default;
+$baseline_04: baseline( 4) !default;
+$baseline_05: baseline( 5) !default;
+$baseline_06: baseline( 6) !default;
+$baseline_07: baseline( 7) !default;
+$baseline_08: baseline( 8) !default;
+$baseline_09: baseline( 9) !default;
+$baseline_10: baseline(10) !default;
+$baseline_11: baseline(11) !default;
+$baseline_12: baseline(12) !default;
+
+$baseline: (
+    1:  baseline( 1),
+    2:  baseline( 2),
+    3:  baseline( 3),
+    4:  baseline( 4),
+    5:  baseline( 5),
+    6:  baseline( 6),
+    7:  baseline( 7),
+    8:  baseline( 8),
+    9:  baseline( 9),
+    10: baseline(10),
+    11: baseline(11),
+    12: baseline(12),
+) !default;
+
+
+
 
 
 

diff --git a/dist/scss/_unit.scss b/dist/scss/_unit.scss
@@ -49,10 +49,6 @@ $q: 0.0625rem !default;  // 1px, or 0.25mm
 
 
 
-
-
-
-
 // Minimum and maximum Kyū sizes
 $q_min: 0.75px !default;
 $q_max: 1.50px !default;

diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
             "url": "https://github.com/sponsors/scape-foundation"
         }
     ],
-    "main": "src/scss/index.scss",
+    "main": "src/scss/index.ts",
     "type": "module",
     "module": "dist/js/unit.gl.js",
     "style": "dist/css/unit.gl.css",
@@ -119,18 +119,5 @@
         "dist/scss/**/*.{scss}",
         "src/font/**/*.{ttf,woff,woff2}",
         "!.DS_Store"
-    ],
-    "hugo-bin": {
-        "buildTags": "extended"
-    },
-    "jspm": {
-        "registry": "npm",
-        "main": "dist/js/unit.gl.js",
-        "directories": {
-            "lib": "src"
-        },
-        "shim": {},
-        "dependencies": {},
-        "peerDependencies": {}
-    }
+    ]
 }
diff --git a/src/scss/_scale.scss b/src/scss/_scale.scss
@@ -32,22 +32,6 @@ $line_height_base:  calc($line_height_scalar * $rhythm_base); // Base line heigh
 
 
 
-$basepoint: (
-    1:  basepoint( 1),
-    2:  basepoint( 2),
-    3:  basepoint( 3),
-    4:  basepoint( 4),
-    5:  basepoint( 5),
-    6:  basepoint( 6),
-    7:  basepoint( 7),
-    8:  basepoint( 8),
-    9:  basepoint( 9),
-    10: basepoint(10),
-    11: basepoint(11),
-    12: basepoint(12),
-) !default;
-
-
 // Typography ladder map
 $typographic_scale: (
     1:  q( 4),
@@ -92,6 +76,84 @@ $typographic_scale: (
 
 
 
+// Kyu Point Scale
+// ----------------------------------------------------------------------------
+
+$basepoint_scale: 4;
+
+@function basepoint($value) {
+  @return calc($q * $value * $basepoint_scale);
+}
+
+$basepoint_01: basepoint( 1) !default;
+$basepoint_02: basepoint( 2) !default;
+$basepoint_03: basepoint( 3) !default;
+$basepoint_04: basepoint( 4) !default;
+$basepoint_05: basepoint( 5) !default;
+$basepoint_06: basepoint( 6) !default;
+$basepoint_07: basepoint( 7) !default;
+$basepoint_08: basepoint( 8) !default;
+$basepoint_09: basepoint( 9) !default;
+$basepoint_10: basepoint(10) !default;
+$basepoint_11: basepoint(11) !default;
+$basepoint_12: basepoint(12) !default;
+
+$basepoint: (
+    1:  basepoint( 1),
+    2:  basepoint( 2),
+    3:  basepoint( 3),
+    4:  basepoint( 4),
+    5:  basepoint( 5),
+    6:  basepoint( 6),
+    7:  basepoint( 7),
+    8:  basepoint( 8),
+    9:  basepoint( 9),
+    10: basepoint(10),
+    11: basepoint(11),
+    12: basepoint(12),
+) !default;
+
+
+// Kyu Baseline Scale
+// ----------------------------------------------------------------------------
+
+$baseline_scale: 5;
+
+@function baseline($value) {
+  @return calc($q * $value * $baseline_scale);
+}
+
+$baseline_00: baseline( 1) !default;
+$baseline_01: baseline( 1) !default;
+$baseline_02: baseline( 2) !default;
+$baseline_03: baseline( 3) !default;
+$baseline_04: baseline( 4) !default;
+$baseline_05: baseline( 5) !default;
+$baseline_06: baseline( 6) !default;
+$baseline_07: baseline( 7) !default;
+$baseline_08: baseline( 8) !default;
+$baseline_09: baseline( 9) !default;
+$baseline_10: baseline(10) !default;
+$baseline_11: baseline(11) !default;
+$baseline_12: baseline(12) !default;
+
+$baseline: (
+    1:  baseline( 1),
+    2:  baseline( 2),
+    3:  baseline( 3),
+    4:  baseline( 4),
+    5:  baseline( 5),
+    6:  baseline( 6),
+    7:  baseline( 7),
+    8:  baseline( 8),
+    9:  baseline( 9),
+    10: baseline(10),
+    11: baseline(11),
+    12: baseline(12),
+) !default;
+
+
+
 
 
 

diff --git a/src/scss/_unit.scss b/src/scss/_unit.scss
@@ -49,10 +49,6 @@ $q: 0.0625rem !default;  // 1px, or 0.25mm
 
 
 
-
-
-
-
 // Minimum and maximum Kyū sizes
 $q_min: 0.75px !default;
 $q_max: 1.50px !default;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,10 +49,6 @@ $q: 0.0625rem !default; // 1px, or 0.25mm







		// Minimum and maximum Kyū sizes
		$q_min: 0.75px !default;
		$q_max: 1.50px !default;
Expand Down