From 4274e5cca008d1eb537b1131d30c7c491be4043c Mon Sep 17 00:00:00 2001 From: Peter Kulko Date: Wed, 13 Nov 2024 10:37:26 +0200 Subject: [PATCH] refactor: corrected ratio tokens type and renamed edx theme --- tokens/src/core/components/Dropdown.json | 2 +- tokens/src/core/components/Modal.json | 2 +- tokens/src/core/components/Popover.json | 2 +- tokens/src/core/components/ProductTour.json | 2 +- tokens/src/core/components/Sheet.json | 2 +- tokens/src/core/components/Tooltip.json | 2 +- tokens/src/core/global/elevation.json | 2 +- tokens/src/themes/light/components/Button/core.json | 2 +- tokens/src/themes/light/components/Carousel.json | 2 +- tokens/src/themes/light/components/Chip.json | 2 +- tokens/src/themes/light/components/Form/other.json | 2 +- tokens/src/themes/light/components/SearchField.json | 2 +- tokens/src/themes/light/components/Tooltip.json | 2 +- www/theme-config.js | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tokens/src/core/components/Dropdown.json b/tokens/src/core/components/Dropdown.json index a709995611..f125a25cfc 100644 --- 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 index 542cc4f3f0..de3e27ee52 100644 --- 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 index de243f5e09..7a2bcc2f98 100644 --- 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 index 7fa18169f0..13aa5c5679 100644 --- 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 index 103e8f7f2c..12f8cb0c1b 100644 --- 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 index 1df0b65bdc..092a2d8124 100644 --- 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 index df668415a4..16f42c3061 100644 --- 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 index 8b29b583ef..2a8c1f4bfe 100644 --- 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 index fd4e5a58f4..024aaf47b7 100644 --- 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 index 291598a431..b11b7c36ea 100644 --- 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 index 80140fe9c8..5970074591 100644 --- 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 index 8df063f176..16f2fd39d3 100644 --- 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 index 7336e557a3..81062e6ec8 100644 --- 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 index d2232f4322..70f586d4be 100644 --- 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', },