From 28b60d9123d9420488bc2aa27ca6c2d6c0336e1c Mon Sep 17 00:00:00 2001 From: Benjamin Leonard Date: Mon, 3 Oct 2022 17:11:53 +0100 Subject: [PATCH 1/8] Update --- styles/src/tokens.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/src/tokens.json b/styles/src/tokens.json index 27a858bf..b51e1f1e 100644 --- a/styles/src/tokens.json +++ b/styles/src/tokens.json @@ -2156,4 +2156,4 @@ "main" ] } -} +} \ No newline at end of file From b6f050d35d95ef44e0e879677ea74c2ea88ca2ee Mon Sep 17 00:00:00 2001 From: benjaminleonard Date: Mon, 3 Oct 2022 17:13:47 +0100 Subject: [PATCH 2/8] Update commit path --- .github/workflows/build-themes.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-themes.yaml b/.github/workflows/build-themes.yaml index 32b25ac1..3be7c45a 100644 --- a/.github/workflows/build-themes.yaml +++ b/.github/workflows/build-themes.yaml @@ -33,7 +33,7 @@ jobs: - uses: EndBug/add-and-commit@v7 with: - add: ./libs/ui/styles/themes + add: ./styles/dist message: 'Update themes from token file' default_author: github_actions From e4a69becc5909fee571d97c579ab011945cfbc07 Mon Sep 17 00:00:00 2001 From: Benjamin Leonard Date: Mon, 3 Oct 2022 17:44:06 +0100 Subject: [PATCH 3/8] Workflow test --- styles/src/tokens.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/src/tokens.json b/styles/src/tokens.json index b51e1f1e..a5d41690 100644 --- a/styles/src/tokens.json +++ b/styles/src/tokens.json @@ -10,7 +10,7 @@ "type": "borderRadius" }, "full": { - "value": "9999", + "value": "10000", "type": "borderRadius" } }, From c6b53c745c344fcc1f76af479fff5f80583b280e Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 16:44:43 +0000 Subject: [PATCH 4/8] Update themes from token file --- styles/dist/blue.css | 2 +- styles/dist/main.css | 2 +- styles/dist/purple.css | 2 +- styles/dist/yellow.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/styles/dist/blue.css b/styles/dist/blue.css index 69ba985d..72945f9a 100644 --- a/styles/dist/blue.css +++ b/styles/dist/blue.css @@ -583,5 +583,5 @@ --border-radius-sm: 0.125rem; --border-radius: 0.1875rem; ---border-radius-full: 624.9375rem; +--border-radius-full: 625rem; } \ No newline at end of file diff --git a/styles/dist/main.css b/styles/dist/main.css index 1a1870ff..39c2b8df 100644 --- a/styles/dist/main.css +++ b/styles/dist/main.css @@ -685,5 +685,5 @@ --border-radius-sm: 0.125rem; --border-radius: 0.1875rem; ---border-radius-full: 624.9375rem; +--border-radius-full: 625rem; } \ No newline at end of file diff --git a/styles/dist/purple.css b/styles/dist/purple.css index dbce50bc..ba1e880d 100644 --- a/styles/dist/purple.css +++ b/styles/dist/purple.css @@ -583,5 +583,5 @@ --border-radius-sm: 0.125rem; --border-radius: 0.1875rem; ---border-radius-full: 624.9375rem; +--border-radius-full: 625rem; } \ No newline at end of file diff --git a/styles/dist/yellow.css b/styles/dist/yellow.css index 63ee0a04..5e59a8b4 100644 --- a/styles/dist/yellow.css +++ b/styles/dist/yellow.css @@ -583,5 +583,5 @@ --border-radius-sm: 0.125rem; --border-radius: 0.1875rem; ---border-radius-full: 624.9375rem; +--border-radius-full: 625rem; } \ No newline at end of file From 764828d154c389d6c97037218a24e4af3bb0f1e0 Mon Sep 17 00:00:00 2001 From: Justin Bennett Date: Tue, 4 Oct 2022 13:57:26 -0400 Subject: [PATCH 5/8] Fix tokens build --- .github/workflows/build-themes.yaml | 2 +- package-lock.json | 2 +- styles/src/tokens.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-themes.yaml b/.github/workflows/build-themes.yaml index 3be7c45a..b088b9d9 100644 --- a/.github/workflows/build-themes.yaml +++ b/.github/workflows/build-themes.yaml @@ -42,5 +42,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | if [[ $(gh pr list --json "url" -q ".[].url" --head figma-tokens | wc -c) -eq 0 ]]; then - gh pr create --base main --head figma-tokens --title "Autogenerate themes from new tokens" --body "This PR is generated by 'build-themes.yaml' when new changes are made to tokens.json" + gh pr create --base master --head figma-tokens --title "Autogenerate themes from new tokens" --body "This PR is generated by 'build-themes.yaml' when new changes are made to tokens.json" fi diff --git a/package-lock.json b/package-lock.json index 4b164b35..87af2ec3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "@oxide/design-system", "version": "0.0.2", - "license": "ISC", + "license": "MPL 2.0", "dependencies": { "style-dictionary": "^3.7.1", "token-transformer": "^0.0.26", diff --git a/styles/src/tokens.json b/styles/src/tokens.json index a5d41690..4ff54cc0 100644 --- a/styles/src/tokens.json +++ b/styles/src/tokens.json @@ -2156,4 +2156,4 @@ "main" ] } -} \ No newline at end of file +} From c743526617d61870d4fe137060c45e7fd332929d Mon Sep 17 00:00:00 2001 From: Benjamin Leonard Date: Tue, 4 Oct 2022 18:59:53 +0100 Subject: [PATCH 6/8] Undo test change --- styles/src/tokens.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/src/tokens.json b/styles/src/tokens.json index 4ff54cc0..b51e1f1e 100644 --- a/styles/src/tokens.json +++ b/styles/src/tokens.json @@ -10,7 +10,7 @@ "type": "borderRadius" }, "full": { - "value": "10000", + "value": "9999", "type": "borderRadius" } }, @@ -2156,4 +2156,4 @@ "main" ] } -} +} \ No newline at end of file From a512d181779a1e8824d1f9302fd0bc00702bf8f2 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 18:00:22 +0000 Subject: [PATCH 7/8] Update themes from token file --- styles/dist/blue.css | 2 +- styles/dist/main.css | 2 +- styles/dist/purple.css | 2 +- styles/dist/yellow.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/styles/dist/blue.css b/styles/dist/blue.css index 72945f9a..69ba985d 100644 --- a/styles/dist/blue.css +++ b/styles/dist/blue.css @@ -583,5 +583,5 @@ --border-radius-sm: 0.125rem; --border-radius: 0.1875rem; ---border-radius-full: 625rem; +--border-radius-full: 624.9375rem; } \ No newline at end of file diff --git a/styles/dist/main.css b/styles/dist/main.css index 39c2b8df..1a1870ff 100644 --- a/styles/dist/main.css +++ b/styles/dist/main.css @@ -685,5 +685,5 @@ --border-radius-sm: 0.125rem; --border-radius: 0.1875rem; ---border-radius-full: 625rem; +--border-radius-full: 624.9375rem; } \ No newline at end of file diff --git a/styles/dist/purple.css b/styles/dist/purple.css index ba1e880d..dbce50bc 100644 --- a/styles/dist/purple.css +++ b/styles/dist/purple.css @@ -583,5 +583,5 @@ --border-radius-sm: 0.125rem; --border-radius: 0.1875rem; ---border-radius-full: 625rem; +--border-radius-full: 624.9375rem; } \ No newline at end of file diff --git a/styles/dist/yellow.css b/styles/dist/yellow.css index 5e59a8b4..63ee0a04 100644 --- a/styles/dist/yellow.css +++ b/styles/dist/yellow.css @@ -583,5 +583,5 @@ --border-radius-sm: 0.125rem; --border-radius: 0.1875rem; ---border-radius-full: 625rem; +--border-radius-full: 624.9375rem; } \ No newline at end of file From bbef35848e63d3bfef49daa2db01d8c82557b393 Mon Sep 17 00:00:00 2001 From: Justin Bennett Date: Tue, 4 Oct 2022 14:23:16 -0400 Subject: [PATCH 8/8] Whitespace change --- styles/src/tokens.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/src/tokens.json b/styles/src/tokens.json index b51e1f1e..27a858bf 100644 --- a/styles/src/tokens.json +++ b/styles/src/tokens.json @@ -2156,4 +2156,4 @@ "main" ] } -} \ No newline at end of file +}