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.

Fix layout (#1985)

Ivan Starkovdde795317a4b
diff --git a/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx b/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
index 8f0fd93149..e4c1b06add 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
@@ -20,6 +20,7 @@ export const BooleanControl = ({
id={id}
checked={prop?.value ?? false}
onCheckedChange={(value) => onChange({ type: "boolean", value })}
+ css={{ justifySelf: "end" }}
/>
</HorizontalLayout>
);
diff --git a/apps/builder/app/builder/features/settings-panel/controls/color.tsx b/apps/builder/app/builder/features/settings-panel/controls/color.tsx
index b705de5ae6..ed8857d235 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/color.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/color.tsx
@@ -1,4 +1,4 @@
-import { InputField, theme, useId } from "@webstudio-is/design-system";
+import { InputField, useId } from "@webstudio-is/design-system";
import {
type ControlProps,
getLabel,
@@ -39,7 +39,6 @@ export const ColorControl = ({
localValue.save();
}
}}
- css={{ width: theme.spacing[22] }}
/>
</HorizontalLayout>
);
diff --git a/apps/builder/app/builder/features/settings-panel/controls/number.tsx b/apps/builder/app/builder/features/settings-panel/controls/number.tsx
index 98cd3dff75..108ed980f0 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/number.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/number.tsx
@@ -1,4 +1,4 @@
-import { InputField, theme, useId } from "@webstudio-is/design-system";
+import { InputField, useId } from "@webstudio-is/design-system";
import {
type ControlProps,
getLabel,
@@ -44,7 +44,6 @@ export const NumberControl = ({
localValue.save();
}
}}
- css={{ width: theme.spacing[21] }}
/>
</HorizontalLayout>
);
diff --git a/apps/builder/app/builder/features/settings-panel/controls/text.tsx b/apps/builder/app/builder/features/settings-panel/controls/text.tsx
index 89c181f7e1..7587df0b7d 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/text.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/text.tsx
@@ -123,7 +123,7 @@ export const TextControl = ({
if (isTwoColumnLayout) {
return (
<HorizontalLayout label={label} id={id} onDelete={onDelete}>
- <Flex css={{ width: theme.spacing[22] }}>{input}</Flex>
+ <Flex>{input}</Flex>
</HorizontalLayout>
);
}
diff --git a/apps/builder/app/builder/features/settings-panel/shared.tsx b/apps/builder/app/builder/features/settings-panel/shared.tsx
index 99a42344aa..d33b242f83 100644
--- a/apps/builder/app/builder/features/settings-panel/shared.tsx
+++ b/apps/builder/app/builder/features/settings-panel/shared.tsx
@@ -17,6 +17,7 @@ import {
Tooltip,
Box,
Flex,
+ Grid,
theme,
type CSS,
} from "@webstudio-is/design-system";
@@ -151,18 +152,28 @@ export const HorizontalLayout = ({
onDelete,
children,
}: LayoutProps) => (
- <Flex
- css={{ minHeight: theme.spacing[13] }}
- justify="between"
+ <Grid
+ css={{
+ gridTemplateColumns: `${theme.spacing[19]} 1fr`,
+ minHeight: theme.spacing[13],
+ }}
align="center"
gap="2"
>
<Label htmlFor={id}>{label}</Label>
- <Flex align="center" gap="2">
+ <Grid
+ css={{
+ gridTemplateColumns: `1fr`,
+ gridAutoFlow: "column",
+ gridAutoColumns: "auto",
+ }}
+ align="center"
+ gap="2"
+ >
{children}
{onDelete && <RemovePropButton onClick={onDelete} />}
- </Flex>
- </Flex>
+ </Grid>
+ </Grid>
);
export const Row = ({ children, css }: { children: ReactNode; css?: CSS }) => (