Skip to content

Commit

Permalink
Merge release/2.4.3 into main branch (#1128)
Browse files Browse the repository at this point in the history
* add Synthesis spacing variables (#1123)

* add warning and error tooltips (#1126)
  • Loading branch information
github-actions[bot] authored Jan 12, 2024
1 parent 5e1795a commit c18d468
Show file tree
Hide file tree
Showing 43 changed files with 418 additions and 187 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
run: yarn build-storybook

- name: Upload
uses: actions/upload-pages-artifact@v3
uses: actions/upload-pages-artifact@v1.0.4
with:
path: 'storybook-static'

- name: Deploy
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@v1
with:
token: ${{ github.token }}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@user-interviews/ui-design-system",
"version": "2.4.2",
"version": "2.4.3",
"dependencies": {
"@tiptap/core": "^2.0.3",
"@tiptap/extension-bold": "^2.0.3",
Expand Down
2 changes: 1 addition & 1 deletion scss/colors/synthesis-palette.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $synth-error-red-light: #fae1e1;
$synth-warning-amber-dark: #fbda36;
$synth-warning-amber-medium: #ffe356;
$synth-warning-amber-light: #fff1ab;
$synth-warning-amber-alternate: #f59c27;
$synth-warning-amber-alternate: #f16e00;

// neutrals
$synth-alert-bg-neutral: #f4f4f4;
Expand Down
18 changes: 18 additions & 0 deletions scss/spacing.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,25 @@
// TODO: deprecate after swapping for synth spacing vars
$ux-spacing-10: 4px;
$ux-spacing-20: 8px;
$ux-spacing-30: 12px;
$ux-spacing-40: 16px;
$ux-spacing-50: 24px;
$ux-spacing-60: 32px;
$ux-spacing-70: 48px;

$synth-spacing-base: 4px;

// Increments of 4 according to the 4 pixel grid system
$synth-spacing-1: $synth-spacing-base; // 4px
$synth-spacing-2: $synth-spacing-base * 2; // 8px
$synth-spacing-3: $synth-spacing-base * 3; // 12px
$synth-spacing-4: $synth-spacing-base * 4; // 16px
$synth-spacing-5: $synth-spacing-base * 5; // 20px
$synth-spacing-6: $synth-spacing-base * 6; // 24px
$synth-spacing-7: $synth-spacing-base * 7; // 28px
$synth-spacing-8: $synth-spacing-base * 8; // 32px
$synth-spacing-9: $synth-spacing-base * 9; // 36px
$synth-spacing-10: $synth-spacing-base * 10; // 40px
$synth-spacing-11: $synth-spacing-base * 11; // 44px
$synth-spacing-12: $synth-spacing-base * 12; // 48px

Loading

0 comments on commit c18d468

Please sign in to comment.