wip

webiny · Jan 15, 2025 · a33f313 · a33f313
1 parent 67ecc8b
commit a33f313
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/packages/admin-ui/scripts/importFromFigma/createThemeScss.js b/packages/admin-ui/scripts/importFromFigma/createThemeScss.js
@@ -253,20 +253,20 @@ const createThemeScss = normalizedFigmaExport => {
                         `--text-h3-weight: var(--font-weight-semibold);`
                     ],
                     [
-                        `--text-h4: 20px;`,
-                        `--text-h4-leading: 32px;`,
+                        `--text-h4: var(--text-xl);`,
+                        `--text-h4-leading: var(--text-xl-leading);`,
                         `--text-h4-tracking: initial;`,
                         `--text-h4-weight: var(--font-weight-semibold);`
                     ],
                     [
-                        `--text-h5: 16px;`,
-                        `--text-h5-leading: 20px;`,
+                        `--text-h5: var(--text-lg);`,
+                        `--text-h5-leading: var(--text-lg-leading);`,
                         `--text-h5-tracking: initial;`,
                         `--text-h5-weight: var(--font-weight-semibold);`
                     ],
                     [
-                        `--text-h6: 14px;`,
-                        `--text-h6-leading: 20px;`,
+                        `--text-h6: var(--text-md);`,
+                        `--text-h6-leading: var(--text-md-leading);`,
                         `--text-h6-tracking: initial;`,
                         `--text-h6-weight: var(--font-weight-semibold);`
                     ]

diff --git a/packages/admin-ui/scripts/importFromFigma/exports/Alias tokens.json b/packages/admin-ui/scripts/importFromFigma/exports/Alias tokens.json
diff --git a/packages/admin-ui/src/DropdownMenu/DropdownMenu.tsx b/packages/admin-ui/src/DropdownMenu/DropdownMenu.tsx
@@ -47,7 +47,7 @@ const DropdownMenuBase = React.forwardRef<
             triggerProps: {
                 // Temporary fix. We need this because `ref` doesn't get passed to components
                 // that are decorated with `makeDecoratable`. This will be fixed in the future.
-                children: <div className={"inline-block"}>{trigger}</div>
+                children: <div className={"inline-s"}>{trigger}</div>
             },
             contentProps: rest
         };

diff --git a/packages/admin-ui/src/theme.scss b/packages/admin-ui/src/theme.scss
@@ -214,16 +214,16 @@
     --text-h3-leading: var(--text-xxl-leading);
     --text-h3-tracking: var(--text-xxl-tracking);
     --text-h3-weight: var(--font-weight-semibold);
-    --text-h4: 20px;
-    --text-h4-leading: 32px;
+    --text-h4: var(--text-xl);
+    --text-h4-leading: var(--text-xl-leading);
     --text-h4-tracking: initial;
     --text-h4-weight: var(--font-weight-semibold);
-    --text-h5: 16px;
-    --text-h5-leading: 20px;
+    --text-h5: var(--text-lg);
+    --text-h5-leading: var(--text-lg-leading);
     --text-h5-tracking: initial;
     --text-h5-weight: var(--font-weight-semibold);
-    --text-h6: 14px;
-    --text-h6-leading: 20px;
+    --text-h6: var(--text-md);
+    --text-h6-leading: var(--text-md-leading);
     --text-h6-tracking: initial;
     --text-h6-weight: var(--font-weight-semibold);
     --text-sm: 12px;
@@ -235,11 +235,11 @@
     --text-md-tracking: initial;
     --text-md-weight: normal;
     --text-lg: 16px;
-    --text-lg-leading: 22px;
+    --text-lg-leading: 24px;
     --text-lg-tracking: initial;
     --text-lg-weight: normal;
     --text-xl: 20px;
-    --text-xl-leading: 30px;
+    --text-xl-leading: 32px;
     --text-xl-tracking: initial;
     --text-xl-weight: normal;
     --text-xxl: 30px;