refactor: corrected ratio tokens type and renamed edx theme

PKulkoRaccoonGang · PKulkoRaccoonGang · commit 4274e5cca008 · 2024-11-26T12:15:31.000+02:00
diff --git a/tokens/src/core/components/Dropdown.json b/tokens/src/core/components/Dropdown.json
@@ -54,7 +54,7 @@
     }
   },
   "elevation": {
-    "$type": "ratio",
+    "$type": "number",
     "dropdown": {
       "zindex": { "source": "$zindex-dropdown", "$value": "1000" }
     }
diff --git a/tokens/src/core/components/Modal.json b/tokens/src/core/components/Modal.json
@@ -1,6 +1,6 @@
 {
   "elevation": {
-    "$type": "ratio",
+    "$type": "number",
     "modal": {
       "backdrop-zindex": { "source": "$zindex-modal-backdrop", "$value": "1040" },
       "zindex": { "source": "$zindex-modal", "$value": "1050" }
diff --git a/tokens/src/core/components/Popover.json b/tokens/src/core/components/Popover.json
@@ -24,7 +24,7 @@
     }
   },
   "elevation": {
-    "$type": "ratio",
+    "$type": "number",
     "popover": {
       "zindex": { "source": "$zindex-popover", "$value": "1060" }
     }
diff --git a/tokens/src/core/components/ProductTour.json b/tokens/src/core/components/ProductTour.json
@@ -16,7 +16,7 @@
     }
   },
   "elevation": {
-    "$type": "ratio",
+    "$type": "number",
     "product-tour": {
       "checkpoint": {
         "zindex": { "source": "$checkpoint-z-index", "$value": "1060" }
diff --git a/tokens/src/core/components/Sheet.json b/tokens/src/core/components/Sheet.json
@@ -1,6 +1,6 @@
 {
   "elevation": {
-    "$type": "ratio",
+    "$type": "number",
     "sheet": {
       "zindex": {
         "backdrop": { "source": "$zindex-sheet-backdrop", "$value": "1031" },
diff --git a/tokens/src/core/components/Tooltip.json b/tokens/src/core/components/Tooltip.json
@@ -16,7 +16,7 @@
     }
   },
   "elevation": {
-    "$type": "ratio",
+    "$type": "number",
     "tooltip": {
       "zindex": { "source": "$zindex-tooltip", "$value": "1070" }
     }
diff --git a/tokens/src/core/global/elevation.json b/tokens/src/core/global/elevation.json
@@ -1,6 +1,6 @@
 {
   "elevation": {
-    "$type": "ratio",
+    "$type": "number",
     "zindex": {
       "0": {
         "$value": 0,
diff --git a/tokens/src/themes/light/components/Button/core.json b/tokens/src/themes/light/components/Button/core.json
@@ -15,7 +15,7 @@
     }
   },
   "other": {
-    "$type": "ratio",
+    "$type": "number",
     "btn": {
       "disabled-opacity": { "source": "$btn-disabled-opacity", "$value": ".65" }
     }
diff --git a/tokens/src/themes/light/components/Carousel.json b/tokens/src/themes/light/components/Carousel.json
@@ -33,7 +33,7 @@
     }
   },
   "other": {
-    "$type": "ratio",
+    "$type": "number",
     "carousel": {
       "control": {
         "opacity": {
diff --git a/tokens/src/themes/light/components/Chip.json b/tokens/src/themes/light/components/Chip.json
@@ -30,7 +30,7 @@
     }
   },
   "other": {
-    "$type": "ratio",
+    "$type": "number",
     "chip": {
       "opacity-disabled": { "source": "$chip-disable-opacity", "$value": ".3" }
     }
diff --git a/tokens/src/themes/light/components/Form/other.json b/tokens/src/themes/light/components/Form/other.json
@@ -1,7 +1,7 @@
 {
   "other": {
     "form": {
-      "$type": "ratio",
+      "$type": "number",
       "feedback": {
         "tooltip-opacity": {
           "source": "$form-feedback-tooltip-opacity",
diff --git a/tokens/src/themes/light/components/SearchField.json b/tokens/src/themes/light/components/SearchField.json
@@ -17,7 +17,7 @@
     }
   },
   "other": {
-    "$type": "ratio",
+    "$type": "number",
     "search-field": {
       "disabled-opacity": { "source": "$search-disabled-opacity", "$value": ".3" }
     }
diff --git a/tokens/src/themes/light/components/Tooltip.json b/tokens/src/themes/light/components/Tooltip.json
@@ -37,7 +37,7 @@
     }
   },
   "other": {
-    "$type": "ratio",
+    "$type": "number",
     "tooltip": {
       "opacity": { "source": "$tooltip-opacity", "$value": "1" }
     }
diff --git a/www/theme-config.js b/www/theme-config.js
@@ -17,7 +17,7 @@ const THEMES = [
   },
   {
     id: 'edxorg',
-    label: 'edX',
+    label: 'edX.org',
     stylesheet: 'edxorg-theme',
     pathToVariables: '@edx/brand-edx.org/paragon/_variables.scss',
   },

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`}`
`55`	`55`	`},`
`56`	`56`	`"elevation": {`
`57`		`- "$type": "ratio",`
	`57`	`+ "$type": "number",`
`58`	`58`	`"dropdown": {`
`59`	`59`	`"zindex": { "source": "$zindex-dropdown", "$value": "1000" }`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"elevation": {`
`3`		`- "$type": "ratio",`
	`3`	`+ "$type": "number",`
`4`	`4`	`"modal": {`
`5`	`5`	`"backdrop-zindex": { "source": "$zindex-modal-backdrop", "$value": "1040" },`
`6`	`6`	`"zindex": { "source": "$zindex-modal", "$value": "1050" }`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`}`
`25`	`25`	`},`
`26`	`26`	`"elevation": {`
`27`		`- "$type": "ratio",`
	`27`	`+ "$type": "number",`
`28`	`28`	`"popover": {`
`29`	`29`	`"zindex": { "source": "$zindex-popover", "$value": "1060" }`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`}`
`17`	`17`	`},`
`18`	`18`	`"elevation": {`
`19`		`- "$type": "ratio",`
	`19`	`+ "$type": "number",`
`20`	`20`	`"product-tour": {`
`21`	`21`	`"checkpoint": {`
`22`	`22`	`"zindex": { "source": "$checkpoint-z-index", "$value": "1060" }`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`}`
`16`	`16`	`},`
`17`	`17`	`"other": {`
`18`		`- "$type": "ratio",`
	`18`	`+ "$type": "number",`
`19`	`19`	`"btn": {`
`20`	`20`	`"disabled-opacity": { "source": "$btn-disabled-opacity", "$value": ".65" }`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`}`
`34`	`34`	`},`
`35`	`35`	`"other": {`
`36`		`- "$type": "ratio",`
	`36`	`+ "$type": "number",`
`37`	`37`	`"carousel": {`
`38`	`38`	`"control": {`
`39`	`39`	`"opacity": {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`}`
`31`	`31`	`},`
`32`	`32`	`"other": {`
`33`		`- "$type": "ratio",`
	`33`	`+ "$type": "number",`
`34`	`34`	`"chip": {`
`35`	`35`	`"opacity-disabled": { "source": "$chip-disable-opacity", "$value": ".3" }`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"other": {`
`3`	`3`	`"form": {`
`4`		`- "$type": "ratio",`
	`4`	`+ "$type": "number",`
`5`	`5`	`"feedback": {`
`6`	`6`	`"tooltip-opacity": {`
`7`	`7`	`"source": "$form-feedback-tooltip-opacity",`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`}`
`18`	`18`	`},`
`19`	`19`	`"other": {`
`20`		`- "$type": "ratio",`
	`20`	`+ "$type": "number",`
`21`	`21`	`"search-field": {`
`22`	`22`	`"disabled-opacity": { "source": "$search-disabled-opacity", "$value": ".3" }`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`}`
`38`	`38`	`},`
`39`	`39`	`"other": {`
`40`		`- "$type": "ratio",`
	`40`	`+ "$type": "number",`
`41`	`41`	`"tooltip": {`
`42`	`42`	`"opacity": { "source": "$tooltip-opacity", "$value": "1" }`
`43`	`43`	`}`