From 3aef594a960c16806012dcf54d20e4301013f8b0 Mon Sep 17 00:00:00 2001 From: Justin Bennett Date: Mon, 31 Oct 2022 17:16:58 -0500 Subject: [PATCH 1/4] reformat elevation tokens --- styles/src/tokens.json | 222 +++++++++++++++++++++-------------------- 1 file changed, 112 insertions(+), 110 deletions(-) diff --git a/styles/src/tokens.json b/styles/src/tokens.json index 3e7385ff..9aa896e5 100644 --- a/styles/src/tokens.json +++ b/styles/src/tokens.json @@ -661,116 +661,118 @@ } } }, - "Elevation 1": { - "value": [ - { - "color": "#00000021", - "type": "dropShadow", - "x": 0, - "y": 0.65625, - "blur": 4.625, - "spread": 0 - }, - { - "color": "#00000033", - "type": "dropShadow", - "x": 0, - "y": 3, - "blur": 13, - "spread": 0 - }, - { - "color": "#00000045", - "type": "dropShadow", - "x": 0, - "y": 7.59375, - "blur": 34.875, - "spread": 0 - }, - { - "color": "#00000066", - "type": "dropShadow", - "x": 0, - "y": 15, - "blur": 80, - "spread": 0 - } - ], - "type": "boxShadow" - }, - "Elevation 2": { - "value": [ - { - "color": "#00000021", - "type": "dropShadow", - "x": 0, - "y": 2.1875, - "blur": 4.625, - "spread": 0 - }, - { - "color": "#00000033", - "type": "dropShadow", - "x": 0, - "y": 10, - "blur": 13, - "spread": 0 - }, - { - "color": "#00000045", - "type": "dropShadow", - "x": 0, - "y": 25.3125, - "blur": 34.875, - "spread": 0 - }, - { - "color": "#00000066", - "type": "dropShadow", - "x": 0, - "y": 50, - "blur": 80, - "spread": 0 - } - ], - "type": "boxShadow" - }, - "Elevation 3": { - "value": [ - { - "color": "#00000021", - "type": "dropShadow", - "x": 0, - "y": 4.375, - "blur": 4.625, - "spread": 0 - }, - { - "color": "#00000033", - "type": "dropShadow", - "x": 0, - "y": 20, - "blur": 13, - "spread": 0 - }, - { - "color": "#00000045", - "type": "dropShadow", - "x": 0, - "y": 50.625, - "blur": 34.875, - "spread": 0 - }, - { - "color": "#00000066", - "type": "dropShadow", - "x": 0, - "y": 100, - "blur": 80, - "spread": 0 - } - ], - "type": "boxShadow" + "elevation": { + "1": { + "value": [ + { + "color": "#00000021", + "type": "dropShadow", + "x": 0, + "y": 0.65625, + "blur": 4.625, + "spread": 0 + }, + { + "color": "#00000033", + "type": "dropShadow", + "x": 0, + "y": 3, + "blur": 13, + "spread": 0 + }, + { + "color": "#00000045", + "type": "dropShadow", + "x": 0, + "y": 7.59375, + "blur": 34.875, + "spread": 0 + }, + { + "color": "#00000066", + "type": "dropShadow", + "x": 0, + "y": 15, + "blur": 80, + "spread": 0 + } + ], + "type": "boxShadow" + }, + "2": { + "value": [ + { + "color": "#00000021", + "type": "dropShadow", + "x": 0, + "y": 2.1875, + "blur": 4.625, + "spread": 0 + }, + { + "color": "#00000033", + "type": "dropShadow", + "x": 0, + "y": 10, + "blur": 13, + "spread": 0 + }, + { + "color": "#00000045", + "type": "dropShadow", + "x": 0, + "y": 25.3125, + "blur": 34.875, + "spread": 0 + }, + { + "color": "#00000066", + "type": "dropShadow", + "x": 0, + "y": 50, + "blur": 80, + "spread": 0 + } + ], + "type": "boxShadow" + }, + "3": { + "value": [ + { + "color": "#00000021", + "type": "dropShadow", + "x": 0, + "y": 4.375, + "blur": 4.625, + "spread": 0 + }, + { + "color": "#00000033", + "type": "dropShadow", + "x": 0, + "y": 20, + "blur": 13, + "spread": 0 + }, + { + "color": "#00000045", + "type": "dropShadow", + "x": 0, + "y": 50.625, + "blur": 34.875, + "spread": 0 + }, + { + "color": "#00000066", + "type": "dropShadow", + "x": 0, + "y": 100, + "blur": 80, + "spread": 0 + } + ], + "type": "boxShadow" + } } }, "yellow-accent": { From c736f724ba2d9516787c6e5514f20d0bc0be64cf Mon Sep 17 00:00:00 2001 From: Benjamin Leonard Date: Tue, 1 Nov 2022 12:58:36 +0000 Subject: [PATCH 2/4] Update names add elevation-none --- styles/src/tokens.json | 117 +++++++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 52 deletions(-) diff --git a/styles/src/tokens.json b/styles/src/tokens.json index 9aa896e5..800679f4 100644 --- a/styles/src/tokens.json +++ b/styles/src/tokens.json @@ -662,113 +662,126 @@ } }, "elevation": { - "1": { + "none": { + "value": [ + { + "color": "none", + "type": "dropShadow", + "x": "", + "y": "", + "blur": "", + "spread": "" + } + ], + "type": "boxShadow" + }, + "sm": { "value": [ { "color": "#00000021", "type": "dropShadow", - "x": 0, - "y": 0.65625, - "blur": 4.625, - "spread": 0 + "x": "0", + "y": "0.65625", + "blur": "4.625", + "spread": "0" }, { "color": "#00000033", "type": "dropShadow", - "x": 0, - "y": 3, - "blur": 13, - "spread": 0 + "x": "0", + "y": "3", + "blur": "13", + "spread": "0" }, { "color": "#00000045", "type": "dropShadow", - "x": 0, - "y": 7.59375, - "blur": 34.875, - "spread": 0 + "x": "0", + "y": "7.59375", + "blur": "34.875", + "spread": "0" }, { "color": "#00000066", "type": "dropShadow", - "x": 0, - "y": 15, - "blur": 80, - "spread": 0 + "x": "0", + "y": "15", + "blur": "80", + "spread": "0" } ], "type": "boxShadow" }, - "2": { + "md": { "value": [ { "color": "#00000021", "type": "dropShadow", - "x": 0, - "y": 2.1875, - "blur": 4.625, - "spread": 0 + "x": "0", + "y": "2.1875", + "blur": "4.625", + "spread": "0" }, { "color": "#00000033", "type": "dropShadow", - "x": 0, - "y": 10, - "blur": 13, - "spread": 0 + "x": "0", + "y": "10", + "blur": "13", + "spread": "0" }, { "color": "#00000045", "type": "dropShadow", - "x": 0, - "y": 25.3125, - "blur": 34.875, - "spread": 0 + "x": "0", + "y": "25.3125", + "blur": "34.875", + "spread": "0" }, { "color": "#00000066", "type": "dropShadow", - "x": 0, - "y": 50, - "blur": 80, - "spread": 0 + "x": "0", + "y": "50", + "blur": "80", + "spread": "0" } ], "type": "boxShadow" }, - "3": { + "lg": { "value": [ { "color": "#00000021", "type": "dropShadow", - "x": 0, - "y": 4.375, - "blur": 4.625, - "spread": 0 + "x": "0", + "y": "4.375", + "blur": "4.625", + "spread": "0" }, { "color": "#00000033", "type": "dropShadow", - "x": 0, - "y": 20, - "blur": 13, - "spread": 0 + "x": "0", + "y": "20", + "blur": "13", + "spread": "0" }, { "color": "#00000045", "type": "dropShadow", - "x": 0, - "y": 50.625, - "blur": 34.875, - "spread": 0 + "x": "0", + "y": "50.625", + "blur": "34.875", + "spread": "0" }, { "color": "#00000066", "type": "dropShadow", - "x": 0, - "y": 100, - "blur": 80, - "spread": 0 + "x": "0", + "y": "100", + "blur": "80", + "spread": "0" } ], "type": "boxShadow" @@ -2282,4 +2295,4 @@ "main" ] } -} +} \ No newline at end of file From 994e1f10355bbfd7dbc918127cd7ab536915ee31 Mon Sep 17 00:00:00 2001 From: Benjamin Leonard Date: Tue, 1 Nov 2022 14:14:48 +0000 Subject: [PATCH 3/4] Renaming elevation tokens to 0/1/2/3 --- styles/src/tokens.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/styles/src/tokens.json b/styles/src/tokens.json index 800679f4..6daacc75 100644 --- a/styles/src/tokens.json +++ b/styles/src/tokens.json @@ -662,7 +662,7 @@ } }, "elevation": { - "none": { + "0": { "value": [ { "color": "none", @@ -675,7 +675,7 @@ ], "type": "boxShadow" }, - "sm": { + "1": { "value": [ { "color": "#00000021", @@ -712,7 +712,7 @@ ], "type": "boxShadow" }, - "md": { + "2": { "value": [ { "color": "#00000021", @@ -749,7 +749,7 @@ ], "type": "boxShadow" }, - "lg": { + "3": { "value": [ { "color": "#00000021", From 6ffc3bfa8d1007adc71957a3da8d1558c0839a96 Mon Sep 17 00:00:00 2001 From: Justin Bennett Date: Tue, 1 Nov 2022 11:37:02 -0500 Subject: [PATCH 4/4] Collapse elevation-0's boxshadow def --- styles/src/tokens.json | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/styles/src/tokens.json b/styles/src/tokens.json index 6daacc75..c2df98fc 100644 --- a/styles/src/tokens.json +++ b/styles/src/tokens.json @@ -663,16 +663,7 @@ }, "elevation": { "0": { - "value": [ - { - "color": "none", - "type": "dropShadow", - "x": "", - "y": "", - "blur": "", - "spread": "" - } - ], + "value": "none", "type": "boxShadow" }, "1": { @@ -2295,4 +2286,4 @@ "main" ] } -} \ No newline at end of file +}