Skip to content

Commit c18d468

Browse files
Merge release/2.4.3 into main branch (#1128)
* add Synthesis spacing variables (#1123) * add warning and error tooltips (#1126)
1 parent 5e1795a commit c18d468

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+418
-187
lines changed

.github/workflows/gh-pages-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
run: yarn build-storybook
3737

3838
- name: Upload
39-
uses: actions/upload-pages-artifact@v3
39+
uses: actions/upload-pages-artifact@v1.0.4
4040
with:
4141
path: 'storybook-static'
4242

4343
- name: Deploy
44-
uses: actions/deploy-pages@v4
44+
uses: actions/deploy-pages@v1
4545
with:
4646
token: ${{ github.token }}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@user-interviews/ui-design-system",
3-
"version": "2.4.2",
3+
"version": "2.4.3",
44
"dependencies": {
55
"@tiptap/core": "^2.0.3",
66
"@tiptap/extension-bold": "^2.0.3",

scss/colors/synthesis-palette.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $synth-error-red-light: #fae1e1;
1010
$synth-warning-amber-dark: #fbda36;
1111
$synth-warning-amber-medium: #ffe356;
1212
$synth-warning-amber-light: #fff1ab;
13-
$synth-warning-amber-alternate: #f59c27;
13+
$synth-warning-amber-alternate: #f16e00;
1414

1515
// neutrals
1616
$synth-alert-bg-neutral: #f4f4f4;

scss/spacing.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
1+
// TODO: deprecate after swapping for synth spacing vars
12
$ux-spacing-10: 4px;
23
$ux-spacing-20: 8px;
34
$ux-spacing-30: 12px;
45
$ux-spacing-40: 16px;
56
$ux-spacing-50: 24px;
67
$ux-spacing-60: 32px;
78
$ux-spacing-70: 48px;
9+
10+
$synth-spacing-base: 4px;
11+
12+
// Increments of 4 according to the 4 pixel grid system
13+
$synth-spacing-1: $synth-spacing-base; // 4px
14+
$synth-spacing-2: $synth-spacing-base * 2; // 8px
15+
$synth-spacing-3: $synth-spacing-base * 3; // 12px
16+
$synth-spacing-4: $synth-spacing-base * 4; // 16px
17+
$synth-spacing-5: $synth-spacing-base * 5; // 20px
18+
$synth-spacing-6: $synth-spacing-base * 6; // 24px
19+
$synth-spacing-7: $synth-spacing-base * 7; // 28px
20+
$synth-spacing-8: $synth-spacing-base * 8; // 32px
21+
$synth-spacing-9: $synth-spacing-base * 9; // 36px
22+
$synth-spacing-10: $synth-spacing-base * 10; // 40px
23+
$synth-spacing-11: $synth-spacing-base * 11; // 44px
24+
$synth-spacing-12: $synth-spacing-base * 12; // 48px
25+

0 commit comments

Comments
 (0)