From 2da52c82c39214026b06013848c8b331823aebe3 Mon Sep 17 00:00:00 2001 From: Luke Emmerson-Finch Date: Tue, 11 Jun 2024 13:06:44 +0100 Subject: [PATCH] feat(data): changing skeleton spacing structure to be multi-line and single line --- data/tokens/$themes.json | 20 ++-- data/tokens/components/progress.json | 131 +++++++++++++++++---------- data/tokens/origin.json | 12 +++ 3 files changed, 101 insertions(+), 62 deletions(-) diff --git a/data/tokens/$themes.json b/data/tokens/$themes.json index 5037af50..03272e73 100644 --- a/data/tokens/$themes.json +++ b/data/tokens/$themes.json @@ -503,9 +503,7 @@ "components/tab": "enabled", "components/table": "enabled", "modes/light": "source", - "components/logo": "enabled", - "devicesize/small": "disabled", - "devicesize/large": "disabled" + "components/logo": "enabled" }, "$figmaCollectionId": "VariableCollectionId:859:2624", "$figmaModeId": "859:0", @@ -702,11 +700,6 @@ "progress.space.loader.xg.S": "f5d52514306e93dbbcc1468dd5bb25746610f101", "progress.space.loader.xg.M": "58e7f40ecca93f849bf19b85b89fc87dc5fbf07b", "progress.space.loader.xg.L": "d1790f8fb3d3a5035c66e24f56ceacae0aec306c", - "progress.space.skeleton.yg.XS": "d27f4e211f56cba64b89ae3dc91a6a86c0d971cd", - "progress.space.skeleton.yg.S": "794289c30074b1443305f643680525e9c92b02c5", - "progress.space.skeleton.yg.M": "af4648f90038f927fbba041063f7b6c870b7d0d4", - "progress.space.skeleton.yg.L": "2c9506a8a11b27a79971a85ba02834a98d75074d", - "progress.space.skeleton.yg.XL": "a624e372f6bac3ad1fa585811a39ed23d04444ec", "progress.space.stepflow.yg.M": "2513d419cbb78fdd70dbc9e17f4630ad1df4b9e8", "progress.space.stepflow.steps.xg.M": "cb96770924b7a322ec9fe82450b1922893982d30", "progress.space.stepflow.steps.yg.M": "558102d2adfee8847bea87acf52b507341215d2c", @@ -1582,7 +1575,12 @@ "badge.radius.badge": "53785fe2db08a42eb84ffb1460ea351d428062b8", "badge.space.x.S": "8f978b34ff3f68beaf2658c87f941592f57b1826", "badge.space.x.M": "52be4985c32fdeaa4275b09c021de94afaf480f8", - "badge.borderwidth.badge": "ec76ad0ae3f1ec22660000f581f80e31ce4b7d84" + "badge.borderwidth.badge": "ec76ad0ae3f1ec22660000f581f80e31ce4b7d84", + "progress.space.skeleton.multiline.yg.XS": "d27f4e211f56cba64b89ae3dc91a6a86c0d971cd", + "progress.space.skeleton.multiline.yg.S": "794289c30074b1443305f643680525e9c92b02c5", + "progress.space.skeleton.multiline.yg.M": "af4648f90038f927fbba041063f7b6c870b7d0d4", + "progress.space.skeleton.multiline.yg.L": "2c9506a8a11b27a79971a85ba02834a98d75074d", + "progress.space.skeleton.multiline.yg.XL": "a624e372f6bac3ad1fa585811a39ed23d04444ec" }, "group": "Mode" }, @@ -1591,7 +1589,6 @@ "name": "Large Screen", "$figmaStyleReferences": {}, "selectedTokenSets": { - "devicesize/small": "disabled", "devicesize/large": "enabled" }, "group": "Platforms" @@ -1601,8 +1598,7 @@ "name": "Small Screen", "$figmaStyleReferences": {}, "selectedTokenSets": { - "devicesize/small": "enabled", - "devicesize/large": "disabled" + "devicesize/small": "enabled" }, "group": "Platforms" } diff --git a/data/tokens/components/progress.json b/data/tokens/components/progress.json index 660229fa..ed567649 100644 --- a/data/tokens/components/progress.json +++ b/data/tokens/components/progress.json @@ -277,7 +277,7 @@ "description": "used to represent buttons" }, "circle": { - "value": "{global.radius.container.XXL}", + "value": "{global.radius.circle}", "type": "borderRadius", "description": "Used to represent circular elements such as profiles, badges etc" } @@ -388,58 +388,89 @@ } }, "skeleton": { - "yg": { - "XS": { - "value": "{global.space.micro.M}", - "type": "spacing", - "description": "vertical gap between skeleton bars" - }, - "S": { - "value": "{global.space.micro.M}", - "type": "spacing", - "description": "vertical gap between skeleton bars" - }, - "M": { - "value": "{global.space.micro.M}", - "type": "spacing", - "description": "vertical gap between skeleton bars" - }, - "L": { - "value": "{global.space.micro.L}", - "type": "spacing", - "description": "vertical gap between skeleton bars" + "multiline": { + "yg": { + "XS": { + "value": "{global.space.micro.M}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "S": { + "value": "{global.space.micro.M}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "M": { + "value": "{global.space.micro.M}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "L": { + "value": "{global.space.micro.L}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "XL": { + "value": "{global.space.micro.XL}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + } }, - "XL": { - "value": "{global.space.micro.XXL}", - "type": "spacing", - "description": "vertical gap between skeleton bars" + "y": { + "XS": { + "value": "{global.space.micro.M}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "S": { + "value": "{global.space.micro.XS}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "M": { + "value": "{global.space.micro.XS}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "L": { + "value": "{global.space.micro.S}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "XL": { + "value": "{global.space.micro.S}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + } } }, - "xg": { - "XS": { - "value": "{global.space.micro.L}", - "type": "spacing", - "description": "vertical gap between skeleton bars" - }, - "S": { - "value": "{global.space.micro.L}", - "type": "spacing", - "description": "vertical gap between skeleton bars" - }, - "M": { - "value": "{global.space.micro.XXL}", - "type": "spacing", - "description": "vertical gap between skeleton bars" - }, - "L": { - "value": "{global.space.micro.XXL}", - "type": "spacing", - "description": "vertical gap between skeleton bars" - }, - "XL": { - "value": "{global.space.macro.XS}", - "type": "spacing", - "description": "vertical gap between skeleton bars" + "singleline": { + "xg": { + "XS": { + "value": "{global.space.micro.L}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "S": { + "value": "{global.space.micro.L}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "M": { + "value": "{global.space.micro.XXL}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "L": { + "value": "{global.space.micro.XXL}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + }, + "XL": { + "value": "{global.space.macro.XS}", + "type": "spacing", + "description": "vertical gap between skeleton bars" + } } } }, diff --git a/data/tokens/origin.json b/data/tokens/origin.json index 410381c0..d2a7cdd6 100644 --- a/data/tokens/origin.json +++ b/data/tokens/origin.json @@ -126,6 +126,18 @@ "value": "8", "type": "sizing", "description": "SCALE is the base-scale of all size-related tokens (size, space, dimension). It's set to 8px as this is our default multiplier used across the majority of components. If you change it, it will change all size-related tokens." + }, + "breakpoint": { + "S": { + "value": "0", + "type": "sizing", + "description": "0px breakpoint size and higher" + }, + "L": { + "value": "1025px", + "type": "sizing", + "description": "1025px breakpoint size and higher" + } } }, "dimension": {