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.

Paddings to make space for scroll bar (#1502)

Roman Pominovcacdbddb1422
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
index f4486a67bc..9b2132f671 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
@@ -103,18 +103,16 @@ const ItemSuffix = ({
}, [editingItemId, itemId]);
return (
- <Flex css={{ mr: theme.spacing[5] }} align="center">
- <Tooltip content={menuLabel} disableHoverableContent>
- <MenuButton
- aria-label={menuLabel}
- isParentSelected={isParentSelected}
- onClick={() => onEdit(isEditing ? undefined : itemId)}
- ref={buttonRef}
- >
- {isEditing ? <ChevronRightIcon /> : <MenuIcon />}
- </MenuButton>
- </Tooltip>
- </Flex>
+ <Tooltip content={menuLabel} disableHoverableContent>
+ <MenuButton
+ aria-label={menuLabel}
+ isParentSelected={isParentSelected}
+ onClick={() => onEdit(isEditing ? undefined : itemId)}
+ ref={buttonRef}
+ >
+ {isEditing ? <ChevronRightIcon /> : <MenuIcon />}
+ </MenuButton>
+ </Tooltip>
);
};
@@ -150,7 +148,7 @@ const PagesPanel = ({
suffix={
onEdit && (
<ItemSuffix
- isParentSelected={props.parentIsSelected ?? false}
+ isParentSelected={props.isSelected ?? false}
itemId={props.itemData.id}
editingItemId={editingPageId}
onEdit={onEdit}
diff --git a/apps/builder/app/builder/shared/assets/assets-shell.tsx b/apps/builder/app/builder/shared/assets/assets-shell.tsx
index b510b4edf3..35855f99dc 100644
--- a/apps/builder/app/builder/shared/assets/assets-shell.tsx
+++ b/apps/builder/app/builder/shared/assets/assets-shell.tsx
@@ -1,10 +1,14 @@
import type { ComponentProps } from "react";
import type { AssetType } from "@webstudio-is/asset-uploader";
-import { Flex, ScrollArea, SearchField } from "@webstudio-is/design-system";
+import {
+ Flex,
+ ScrollArea,
+ SearchField,
+ theme,
+} from "@webstudio-is/design-system";
import { AssetUpload } from "./asset-upload";
import { NotFound } from "./not-found";
import { Separator } from "./separator";
-import { theme } from "@webstudio-is/design-system";
type AssetsShellProps = {
searchProps: ComponentProps<typeof SearchField>;
@@ -40,14 +44,7 @@ export const AssetsShell = ({
</Flex>
<Separator />
{isEmpty && <NotFound />}
- <ScrollArea
- css={{
- display: "flex",
- flexDirection: "column",
- px: theme.spacing[9],
- overflow: "auto",
- }}
- >
+ <ScrollArea css={{ display: "flex", flexDirection: "column" }}>
{children}
</ScrollArea>
</Flex>
diff --git a/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx b/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx
index 542a06325c..6f4c8124f8 100644
--- a/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx
+++ b/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx
@@ -3,6 +3,7 @@ import {
ListItem,
useList,
findNextListIndex,
+ theme,
} from "@webstudio-is/design-system";
import {
AssetsShell,
@@ -162,7 +163,9 @@ export const FontsManager = ({ value, onChange }: FontsManagerProps) => {
{uploadedItems.map(renderItem)}
{systemItems.length !== 0 && (
<>
- {uploadedItems.length !== 0 && <Separator />}
+ {uploadedItems.length !== 0 && (
+ <Separator css={{ mx: theme.spacing[9] }} />
+ )}
<ListItem state="disabled">{"System"}</ListItem>
</>
)}
diff --git a/apps/builder/app/builder/shared/image-manager/image-manager.tsx b/apps/builder/app/builder/shared/image-manager/image-manager.tsx
index 57c8ed5a6a..f90a997b07 100644
--- a/apps/builder/app/builder/shared/image-manager/image-manager.tsx
+++ b/apps/builder/app/builder/shared/image-manager/image-manager.tsx
@@ -1,5 +1,5 @@
import { useState, useMemo } from "react";
-import { findNextListIndex, Grid } from "@webstudio-is/design-system";
+import { findNextListIndex, Grid, theme } from "@webstudio-is/design-system";
import {
AssetsShell,
type AssetContainer,
@@ -102,7 +102,7 @@ export const ImageManager = ({ accept, onChange }: ImageManagerProps) => {
type="image"
accept={accept}
>
- <Grid columns={3} gap={2}>
+ <Grid columns={3} gap={2} css={{ px: theme.spacing[9] }}>
{filteredItems.map((assetContainer, index) => (
<ImageThumbnail
key={assetContainer.asset.id}
diff --git a/packages/design-system/src/components/list.tsx b/packages/design-system/src/components/list.tsx
index 7d5465acbf..4ad3dae562 100644
--- a/packages/design-system/src/components/list.tsx
+++ b/packages/design-system/src/components/list.tsx
@@ -4,10 +4,9 @@ import {
forwardRef,
type KeyboardEvent,
} from "react";
-import { styled } from "../stitches.config";
-import { Flex } from "./flex";
import { DeprecatedText2 } from "./__DEPRECATED__/text2";
-import { theme } from "../stitches.config";
+import { Flex } from "./flex";
+import { styled, theme } from "../stitches.config";
const ListBase = styled("ul", {
display: "flex",
@@ -22,18 +21,25 @@ const ListItemBase = styled("li", {
alignItems: "center",
justifyContent: "space-between",
height: theme.spacing[11],
- px: theme.spacing[3],
- mx: theme.spacing[2],
+ paddingLeft: theme.spacing[5],
+ paddingRight: theme.spacing[8],
listStyle: "none",
- borderRadius: theme.borderRadius[4],
outline: 0,
+ position: "relative",
variants: {
state: {
disabled: {
pointerEvents: "none",
},
selected: {
- boxShadow: `0px 0px 0px 2px ${theme.colors.blue10}, 0px 0px 0px 2px ${theme.colors.blue10}`,
+ "&:before": {
+ content: "''",
+ position: "absolute",
+ pointerEvents: "none",
+ inset: `0 ${theme.spacing[3]}`,
+ borderRadius: theme.borderRadius[4],
+ border: `2px solid ${theme.colors.borderFocus}`,
+ },
},
},
},
diff --git a/packages/design-system/src/components/scroll-area.tsx b/packages/design-system/src/components/scroll-area.tsx
index 4dc21b2b9f..f37f04abdf 100644
--- a/packages/design-system/src/components/scroll-area.tsx
+++ b/packages/design-system/src/components/scroll-area.tsx
@@ -9,7 +9,7 @@ const ScrollAreaRoot = styled(Root, {
const ScrollAreaThumb = styled(Thumb, {
boxSizing: "border-box",
- background: theme.colors.foregroundMoreSubtle,
+ background: theme.colors.foregroundScrollBar,
borderRadius: theme.spacing[4],
// increase target size for touch devices https://www.w3.org/WAI/WCAG21/Understanding/target-size.html
position: "relative",
diff --git a/packages/design-system/src/components/tree/tree-node.tsx b/packages/design-system/src/components/tree/tree-node.tsx
index 5c92c946b5..145199b3bf 100644
--- a/packages/design-system/src/components/tree/tree-node.tsx
+++ b/packages/design-system/src/components/tree/tree-node.tsx
@@ -18,11 +18,13 @@ import {
export const INDENT = 16;
const ITEM_HEIGHT = 32;
-const ICONS_SIZE = 15;
-const ITEM_PADDING = 8;
+const ICONS_SIZE = 16;
+const ITEM_PADDING_LEFT = 8;
+// extra padding on the right to make sure scrollbar doesn't obscure anything
+const ITEM_PADDING_RIGHT = 14;
export const getPlacementIndicatorAlignment = (depth: number) => {
- return depth * INDENT + ITEM_PADDING;
+ return depth * INDENT + ITEM_PADDING_LEFT;
};
const suffixWidthVar = cssVars.define("suffix-width");
@@ -36,17 +38,15 @@ const getItemButtonCssVars = ({
suffixVisible: boolean;
}) => {
if (suffixVisible) {
+ const suffixWidth = cssVars.use(suffixWidthVar, "0px");
return {
// We have to use a padding to make space for the suffix
// because we can't put it inside ItemButton (see comment in TreeItemBody)
- [itemButtonVars.paddingRight]: `calc(${ITEM_PADDING}px + ${cssVars.use(
- suffixWidthVar,
- "0"
- )})`,
+ [itemButtonVars.paddingRight]: `calc(${ITEM_PADDING_RIGHT}px + ${suffixWidth})`,
};
}
return {
- [itemButtonVars.paddingRight]: `${ITEM_PADDING}px`,
+ [itemButtonVars.paddingRight]: `${ITEM_PADDING_RIGHT}px`,
};
};
const ItemButton = styled("button", {
@@ -60,7 +60,7 @@ const ItemButton = styled("button", {
margin: 0,
pt: 0,
pb: 0,
- pl: ITEM_PADDING,
+ pl: ITEM_PADDING_LEFT,
pr: cssVars.use(itemButtonVars.paddingRight),
flexBasis: 0,
flexGrow: 1,
@@ -156,7 +156,7 @@ const getSuffixContainerCssVars = ({
const SuffixContainer = styled(Flex, {
position: "absolute",
alignItems: "center",
- right: 0,
+ right: `${ITEM_PADDING_RIGHT}px`,
top: 0,
bottom: 0,
defaultVariants: { align: "center" },
@@ -275,7 +275,7 @@ export const TreeItemBody = <Data extends { id: string }>({
isExpanded,
children,
suffix,
- suffixWidth = suffix ? theme.spacing[11] : "0",
+ suffixWidth = suffix ? theme.spacing[9] : "0px",
alwaysShowSuffix = false,
forceFocus = false,
selectionEvent = "click",
@@ -363,7 +363,7 @@ export const TreeItemBody = <Data extends { id: string }>({
{shouldRenderExpandButton && (
<CollapsibleTrigger
- style={{ left: (level - 1) * INDENT + ITEM_PADDING }}
+ style={{ left: (level - 1) * INDENT + ITEM_PADDING_LEFT }}
// We don't want this trigger to be focusable
tabIndex={-1}
>