From 2d33f73f36b11b85e3cc2793bb02e9903475ce50 Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Tue, 7 Feb 2023 17:34:57 +0000 Subject: [PATCH 1/2] refactor(site): Minor UI tweaks --- site/src/components/Dashboard/DashboardLayout.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/site/src/components/Dashboard/DashboardLayout.tsx b/site/src/components/Dashboard/DashboardLayout.tsx index 372297f931e47..69d775a202a0c 100644 --- a/site/src/components/Dashboard/DashboardLayout.tsx +++ b/site/src/components/Dashboard/DashboardLayout.tsx @@ -71,5 +71,6 @@ const useStyles = makeStyles((theme) => ({ }, siteContent: { flex: 1, + paddingBottom: theme.spacing(6), // Add bottom space since we don't use a footer }, })) From cdd03ba85719a959237651a6eb0652d5d2d03bf7 Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Wed, 8 Feb 2023 22:16:03 +0000 Subject: [PATCH 2/2] Fix bottom space --- site/src/components/Dashboard/DashboardLayout.tsx | 3 ++- .../components/TemplateVersionEditor/TemplateVersionEditor.tsx | 3 ++- site/src/theme/constants.ts | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/site/src/components/Dashboard/DashboardLayout.tsx b/site/src/components/Dashboard/DashboardLayout.tsx index 69d775a202a0c..1dfd2a15c0e4c 100644 --- a/site/src/components/Dashboard/DashboardLayout.tsx +++ b/site/src/components/Dashboard/DashboardLayout.tsx @@ -12,6 +12,7 @@ import { updateCheckMachine } from "xServices/updateCheck/updateCheckXService" import { usePermissions } from "hooks/usePermissions" import { UpdateCheckResponse } from "api/typesGenerated" import { DashboardProvider } from "./DashboardProvider" +import { dashboardContentBottomPadding } from "theme/constants" export const DashboardLayout: FC = () => { const styles = useStyles() @@ -71,6 +72,6 @@ const useStyles = makeStyles((theme) => ({ }, siteContent: { flex: 1, - paddingBottom: theme.spacing(6), // Add bottom space since we don't use a footer + paddingBottom: dashboardContentBottomPadding, // Add bottom space since we don't use a footer }, })) diff --git a/site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx b/site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx index 071c450630980..2e7dc642797d9 100644 --- a/site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx +++ b/site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx @@ -16,7 +16,7 @@ import { AvatarData } from "components/AvatarData/AvatarData" import { TemplateResourcesTable } from "components/TemplateResourcesTable/TemplateResourcesTable" import { WorkspaceBuildLogs } from "components/WorkspaceBuildLogs/WorkspaceBuildLogs" import { FC, useCallback, useEffect, useRef, useState } from "react" -import { navHeight } from "theme/constants" +import { dashboardContentBottomPadding, navHeight } from "theme/constants" import { TemplateVersionFiles } from "util/templateVersion" import { CreateFileDialog, @@ -403,6 +403,7 @@ const useStyles = makeStyles< flex: 1, display: "flex", flexDirection: "column", + marginBottom: -dashboardContentBottomPadding, // Remove dashboard bottom padding }, topbar: { padding: theme.spacing(2), diff --git a/site/src/theme/constants.ts b/site/src/theme/constants.ts index 56421b9225d4c..c5f832f39873f 100644 --- a/site/src/theme/constants.ts +++ b/site/src/theme/constants.ts @@ -8,3 +8,4 @@ export const containerWidth = 1380 export const containerWidthMedium = 1080 export const sidePadding = 24 export const CardPadding = 20 +export const dashboardContentBottomPadding = 8 * 6