Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

changed word "inherited" to "remote" (#1252)

Taylor Nowotny9585ab8a620d
diff --git a/apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-grid.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-grid.tsx
index 00288b1d34..22d7e7f0a9 100644
--- a/apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-grid.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-grid.tsx
@@ -36,10 +36,10 @@ export const FlexGrid = ({
let color = theme.colors.foregroundFlexUiMain;
if (styleSource === "local") {
- color = theme.colors.borderSetFlexUi;
+ color = theme.colors.borderLocalFlexUi;
}
if (styleSource === "remote") {
- color = theme.colors.borderInheritedFlexUi;
+ color = theme.colors.borderRemoteFlexUi;
}
return (
@@ -61,7 +61,7 @@ export const FlexGrid = ({
color,
"&:focus-within": {
outlineWidth: 2,
- outlineColor: theme.colors.borderSetFlexUi,
+ outlineColor: theme.colors.borderLocalFlexUi,
},
}}
>
diff --git a/packages/design-system/src/__generated__/figma-design-tokens.json b/packages/design-system/src/__generated__/figma-design-tokens.json
index 2e7621cd83..4a59facba1 100644
--- a/packages/design-system/src/__generated__/figma-design-tokens.json
+++ b/packages/design-system/src/__generated__/figma-design-tokens.json
@@ -5,18 +5,18 @@
{
"color": "#00000026",
"type": "dropShadow",
- "x": 0,
- "y": 5,
- "blur": 17,
- "spread": 0
+ "x": "0",
+ "y": "5",
+ "blur": "17",
+ "spread": "0"
},
{
"color": "#0000001a",
"type": "dropShadow",
- "x": 0,
- "y": 2,
- "blur": 7,
- "spread": 0
+ "x": "0",
+ "y": "2",
+ "blur": "7",
+ "spread": "0"
}
],
"type": "boxShadow"
@@ -478,7 +478,7 @@
"type": "color"
}
},
- "set": {
+ "local": {
"main": {
"value": "#e1f0ff",
"type": "color"
@@ -488,7 +488,7 @@
"type": "color"
}
},
- "inherited": {
+ "remote": {
"main": {
"value": "#ffe8d7",
"type": "color"
@@ -760,7 +760,7 @@
"description": "color of child lines within the current item of the navigator item & pages panel item"
}
},
- "set": {
+ "local": {
"main": {
"value": "#b7d9f8",
"type": "color",
@@ -772,7 +772,7 @@
"description": "border color of set elements within the flex controls ui"
}
},
- "inherited": {
+ "remote": {
"main": {
"value": "#ffcca7",
"type": "color",
@@ -872,7 +872,7 @@
"description": "color to create a more subtle contrast over colored and dark backgrounds"
}
},
- "set": {
+ "local": {
"main": {
"value": "#016ccc",
"type": "color",
@@ -884,7 +884,7 @@
"description": "foreground color for flex-ui set elements"
}
},
- "inherited": {
+ "remote": {
"main": {
"value": "#b74900",
"type": "color",
@@ -942,10 +942,10 @@
"value": {
"color": "#1717171a",
"type": "dropShadow",
- "x": 0,
- "y": 4,
- "blur": 4,
- "spread": 0
+ "x": "0",
+ "y": "4",
+ "blur": "4",
+ "spread": "0"
},
"type": "boxShadow",
"description": "elevation for small things within the dashboard"
@@ -954,10 +954,10 @@
"value": {
"color": "#1717171a",
"type": "dropShadow",
- "x": 0,
- "y": 8,
- "blur": 16,
- "spread": 0
+ "x": "0",
+ "y": "8",
+ "blur": "16",
+ "spread": "0"
},
"type": "boxShadow",
"description": "elevation for big things within the dashboard"
diff --git a/packages/design-system/src/__generated__/figma-design-tokens.ts b/packages/design-system/src/__generated__/figma-design-tokens.ts
index fcb0127bed..2cb6283c14 100644
--- a/packages/design-system/src/__generated__/figma-design-tokens.ts
+++ b/packages/design-system/src/__generated__/figma-design-tokens.ts
@@ -325,10 +325,10 @@ export const color = {
backgroundInfoNotification: "#edf6ff",
backgroundPresetMain: "#e6e8eb",
backgroundPresetHover: "#dfe3e6",
- backgroundSetMain: "#e1f0ff",
- backgroundSetHover: "#cee7fe",
- backgroundInheritedMain: "#ffe8d7",
- backgroundInheritedHover: "#ffdcc3",
+ backgroundLocalMain: "#e1f0ff",
+ backgroundLocalHover: "#cee7fe",
+ backgroundRemoteMain: "#ffe8d7",
+ backgroundRemoteHover: "#ffdcc3",
backgroundInputSelected: "#b7d9f8",
backgroundInputDisabled: "#f8f8f8",
backgroundInputHighlight: "#b7d9f8",
@@ -388,10 +388,10 @@ export const color = {
borderContrast: "#ffffff",
borderItemChildLine: "#889096",
borderItemChildLineCurrent: "#96c7f2",
- borderSetMain: "#b7d9f8",
- borderSetFlexUi: "#096cff",
- borderInheritedMain: "#ffcca7",
- borderInheritedFlexUi: "#fa934e",
+ borderLocalMain: "#b7d9f8",
+ borderLocalFlexUi: "#096cff",
+ borderRemoteMain: "#ffcca7",
+ borderRemoteFlexUi: "#fa934e",
borderDestructiveMain: "#de3339",
borderDestructiveNotification: "#f9c6c6",
borderDark: "#707375",
@@ -408,10 +408,10 @@ export const color = {
foregroundFlexUiHover: "#96c7f2",
foregroundContrastMain: "#ffffff",
foregroundContrastSubtle: "#c1c8cd",
- foregroundSetMain: "#016ccc",
- foregroundSetFlexUi: "#237cff",
- foregroundInheritedMain: "#b74900",
- foregroundInheritedFlexUi: "#fa934e",
+ foregroundLocalMain: "#016ccc",
+ foregroundLocalFlexUi: "#237cff",
+ foregroundRemoteMain: "#b74900",
+ foregroundRemoteFlexUi: "#fa934e",
foregroundTextMoreSubtle: "#889096",
foregroundPrimary: "#096cff",
foregroundSuccessText: "#00894a",
diff --git a/packages/design-system/src/components/label.tsx b/packages/design-system/src/components/label.tsx
index bb94c3c497..03e1a1bf26 100644
--- a/packages/design-system/src/components/label.tsx
+++ b/packages/design-system/src/components/label.tsx
@@ -41,20 +41,20 @@ const StyledLabel = styled("label", textVariants.labelsSentenceCase, {
},
local: {
px: theme.spacing[3],
- backgroundColor: theme.colors.backgroundSetMain,
- borderColor: theme.colors.borderSetMain,
- color: theme.colors.foregroundSetMain,
+ backgroundColor: theme.colors.backgroundLocalMain,
+ borderColor: theme.colors.borderLocalMain,
+ color: theme.colors.foregroundLocalMain,
"&:hover": {
- backgroundColor: theme.colors.backgroundSetHover,
+ backgroundColor: theme.colors.backgroundLocalHover,
},
},
remote: {
px: theme.spacing[3],
- backgroundColor: theme.colors.backgroundInheritedMain,
- borderColor: theme.colors.borderInheritedMain,
- color: theme.colors.foregroundInheritedMain,
+ backgroundColor: theme.colors.backgroundRemoteMain,
+ borderColor: theme.colors.borderRemoteMain,
+ color: theme.colors.foregroundRemoteMain,
"&:hover": {
- backgroundColor: theme.colors.backgroundInheritedHover,
+ backgroundColor: theme.colors.backgroundRemoteHover,
},
},
},
diff --git a/packages/design-system/src/components/nested-icon-label.tsx b/packages/design-system/src/components/nested-icon-label.tsx
index d5fa0ff2a5..d2d4dcaa13 100644
--- a/packages/design-system/src/components/nested-icon-label.tsx
+++ b/packages/design-system/src/components/nested-icon-label.tsx
@@ -21,16 +21,16 @@ const colors = {
icon: theme.colors.foregroundIconMain,
},
local: {
- border: theme.colors.borderSetMain,
- background: theme.colors.backgroundSetMain,
- backgroundHover: theme.colors.backgroundSetHover,
- icon: theme.colors.foregroundSetMain,
+ border: theme.colors.borderLocalMain,
+ background: theme.colors.backgroundLocalMain,
+ backgroundHover: theme.colors.backgroundLocalHover,
+ icon: theme.colors.foregroundLocalMain,
},
remote: {
- border: theme.colors.borderInheritedMain,
- background: theme.colors.backgroundInheritedMain,
- backgroundHover: theme.colors.backgroundInheritedHover,
- icon: theme.colors.foregroundInheritedMain,
+ border: theme.colors.borderRemoteMain,
+ background: theme.colors.backgroundRemoteMain,
+ backgroundHover: theme.colors.backgroundRemoteHover,
+ icon: theme.colors.foregroundRemoteMain,
},
} as const;