From 68b625a9cdc53beadf24d83ff28691d1a1492a6f Mon Sep 17 00:00:00 2001 From: Matt Glissmann Date: Tue, 10 Dec 2024 17:43:26 -0700 Subject: [PATCH 1/6] Added scale options and create theme variants for testing --- .../src/routes/Scaler/Results.jsx | 3 + .../routes/Scaler/components/ScaleToolbar.jsx | 19 +- sandbox/grommet-app/src/App.jsx | 2 +- .../components/GlobalHeader/GlobalHeader.jsx | 2 +- .../src/pages/sticker-sheet/index.jsx | 2 +- .../src/themes/scale-options/index.js | 8 + .../src/themes/scale-options/scale16133316.js | 120 + .../src/themes/scale-options/scale1613338.js | 116 + .../src/themes/scale-options/scale1614148.js | 112 + .../src/themes/scale-options/scale2413338.js | 124 + .../src/themes/scale-options/scale24141424.js | 120 + .../src/themes/scale-options/scale2414148.js | 120 + .../src/themes/scale-options/scale24150024.js | 116 + .../src/themes/scale-options/v5scale.js | 101 + sandbox/grommet-app/src/themes/scales.js | 67 + .../grommet-app/src/{ => themes}/theme.jsx | 6 +- yarn.lock | 14973 ---------------- 17 files changed, 1033 insertions(+), 14978 deletions(-) create mode 100644 sandbox/grommet-app/src/themes/scale-options/index.js create mode 100644 sandbox/grommet-app/src/themes/scale-options/scale16133316.js create mode 100644 sandbox/grommet-app/src/themes/scale-options/scale1613338.js create mode 100644 sandbox/grommet-app/src/themes/scale-options/scale1614148.js create mode 100644 sandbox/grommet-app/src/themes/scale-options/scale2413338.js create mode 100644 sandbox/grommet-app/src/themes/scale-options/scale24141424.js create mode 100644 sandbox/grommet-app/src/themes/scale-options/scale2414148.js create mode 100644 sandbox/grommet-app/src/themes/scale-options/scale24150024.js create mode 100644 sandbox/grommet-app/src/themes/scale-options/v5scale.js create mode 100644 sandbox/grommet-app/src/themes/scales.js rename sandbox/grommet-app/src/{ => themes}/theme.jsx (99%) delete mode 100644 yarn.lock diff --git a/design-tokens-manager/src/routes/Scaler/Results.jsx b/design-tokens-manager/src/routes/Scaler/Results.jsx index 55ee1fa170..d922e22885 100644 --- a/design-tokens-manager/src/routes/Scaler/Results.jsx +++ b/design-tokens-manager/src/routes/Scaler/Results.jsx @@ -112,6 +112,9 @@ export const Results = ({ diff --git a/design-tokens-manager/src/routes/Scaler/components/ScaleToolbar.jsx b/design-tokens-manager/src/routes/Scaler/components/ScaleToolbar.jsx index a55834d574..4446efb38f 100644 --- a/design-tokens-manager/src/routes/Scaler/components/ScaleToolbar.jsx +++ b/design-tokens-manager/src/routes/Scaler/components/ScaleToolbar.jsx @@ -2,7 +2,24 @@ import { Box, Button } from 'grommet'; import { Sidebar } from 'grommet-icons'; import { CopyButton } from '../../../components/CopyButton'; -export const ScaleToolbar = ({ scale, open, setOpen, ...rest }) => { +export const ScaleToolbar = ({ + scale: scaleProp, + settings, + contentSizes, + spacingSizes, + open, + setOpen, + ...rest +}) => { + const scale = { + name: `${settings.base}-${settings.factor}-${settings.nearest}-${settings.steps}`, + description: `${settings.base}px based scale at ${settings.factor} factor. Rounded to ${settings.nearest}px grid unit with ${settings.steps} steps`, + settings: settings, + scale: scaleProp, + content: contentSizes, + spacing: spacingSizes, + }; + return (