From 3c4e0e835ff06ec6cce7be759112a4a35e91de15 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Mon, 17 Jul 2023 14:39:58 +0000 Subject: [PATCH] fix(site): fix bottom border on build logs --- site/src/components/Logs/Logs.tsx | 6 +++- .../WorkspaceBuildLogs.stories.tsx | 32 +++++++++++-------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/site/src/components/Logs/Logs.tsx b/site/src/components/Logs/Logs.tsx index 2cf345db16671..6ad2e6ddf34df 100644 --- a/site/src/components/Logs/Logs.tsx +++ b/site/src/components/Logs/Logs.tsx @@ -101,7 +101,11 @@ const useStyles = makeStyles< borderRadius: theme.shape.borderRadius, overflowX: "auto", background: theme.palette.background.default, - borderBottom: `1px solid ${theme.palette.divider}`, + + "&:not(:last-child)": { + borderBottom: `1px solid ${theme.palette.divider}`, + borderRadius: 0, + }, }, scrollWrapper: { minWidth: "fit-content", diff --git a/site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.stories.tsx b/site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.stories.tsx index f9912f28da3dc..5060f5910216d 100644 --- a/site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.stories.tsx +++ b/site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.stories.tsx @@ -1,20 +1,24 @@ -import { ComponentMeta, Story } from "@storybook/react" -import { MockWorkspaceBuildLogs } from "../../testHelpers/entities" -import { - WorkspaceBuildLogs, - WorkspaceBuildLogsProps, -} from "./WorkspaceBuildLogs" +import { Meta, StoryObj } from "@storybook/react" +import { WorkspaceBuildLogs } from "./WorkspaceBuildLogs" +import { MockWorkspaceBuildLogs } from "testHelpers/entities" -export default { +const meta: Meta = { title: "components/WorkspaceBuildLogs", component: WorkspaceBuildLogs, -} as ComponentMeta +} + +export default meta -const Template: Story = (args) => ( - -) +type Story = StoryObj + +export const InProgress: Story = { + args: { + logs: MockWorkspaceBuildLogs.slice(0, 20), + }, +} -export const Example = Template.bind({}) -Example.args = { - logs: MockWorkspaceBuildLogs, +export const Completed: Story = { + args: { + logs: MockWorkspaceBuildLogs, + }, }