From 4ef83c33c7294f1febf3b4c041320ed010e7b7bc Mon Sep 17 00:00:00 2001 From: Bruno Date: Fri, 20 May 2022 19:21:11 +0000 Subject: [PATCH 1/3] Add extra footer margin from the top --- site/src/components/Footer/Footer.tsx | 1 + site/src/pages/LoginPage/LoginPage.tsx | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/components/Footer/Footer.tsx b/site/src/components/Footer/Footer.tsx index 00e0a422246d0..d4764cf496fc9 100644 --- a/site/src/components/Footer/Footer.tsx +++ b/site/src/components/Footer/Footer.tsx @@ -42,6 +42,7 @@ const useFooterStyles = makeStyles((theme) => ({ flex: "0", paddingTop: theme.spacing(2), paddingBottom: theme.spacing(2), + marginTop: theme.spacing(3), }, copyRight: { margin: theme.spacing(0.25), diff --git a/site/src/pages/LoginPage/LoginPage.tsx b/site/src/pages/LoginPage/LoginPage.tsx index 660df299a17cf..fe4bcedae5646 100644 --- a/site/src/pages/LoginPage/LoginPage.tsx +++ b/site/src/pages/LoginPage/LoginPage.tsx @@ -17,7 +17,6 @@ export const useStyles = makeStyles((theme) => ({ layout: { display: "flex", flexDirection: "column", - gap: theme.spacing(2), alignItems: "center", }, container: { From 4ccbbe154289bd57da2c8dfd0fdf00b402e65239 Mon Sep 17 00:00:00 2001 From: Bruno Date: Fri, 20 May 2022 19:22:48 +0000 Subject: [PATCH 2/3] Fix logs header spacing --- site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx index 1ae2b1fdcc710..f895373ba2dc2 100644 --- a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx +++ b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx @@ -48,6 +48,7 @@ export const WorkspaceBuildPage: React.FC = () => { const useStyles = makeStyles((theme) => ({ title: { - marginTop: theme.spacing(5), + paddingTop: theme.spacing(5), + paddingBottom: theme.spacing(2), }, })) From ea280eaa884ba0e446a6fbfaeef364486aee47ce Mon Sep 17 00:00:00 2001 From: Bruno Date: Fri, 20 May 2022 19:28:12 +0000 Subject: [PATCH 3/3] Make table row padding standard --- site/src/pages/TemplatesPage/TemplatesPageView.tsx | 8 +------- site/src/pages/WorkspacesPage/WorkspacesPageView.tsx | 8 +------- site/src/theme/overrides.ts | 5 +++++ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx index debe2fa60065a..122863beb3aa4 100644 --- a/site/src/pages/TemplatesPage/TemplatesPageView.tsx +++ b/site/src/pages/TemplatesPage/TemplatesPageView.tsx @@ -77,7 +77,7 @@ export const TemplatesPageView: React.FC = (props) => { )} {props.templates?.map((template) => ( - + @@ -127,12 +127,6 @@ const useStyles = makeStyles((theme) => ({ lineHeight: `${theme.spacing(3)}px`, }, }, - templateRow: { - "& > td": { - paddingTop: theme.spacing(2), - paddingBottom: theme.spacing(2), - }, - }, templateAvatar: { borderRadius: 2, marginRight: theme.spacing(1), diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx index 4138379286b06..e1f173675ccd5 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx @@ -71,7 +71,7 @@ export const WorkspacesPageView: React.FC = (props) => {props.workspaces?.map((workspace) => { const status = getDisplayStatus(theme, workspace.latest_build) return ( - +
@@ -134,12 +134,6 @@ const useStyles = makeStyles((theme) => ({ lineHeight: `${theme.spacing(3)}px`, }, }, - workspaceRow: { - "& > td": { - paddingTop: theme.spacing(2), - paddingBottom: theme.spacing(2), - }, - }, workspaceAvatar: { borderRadius: 2, marginRight: theme.spacing(1), diff --git a/site/src/theme/overrides.ts b/site/src/theme/overrides.ts index c6261c4cceaf1..88f78f5d32353 100644 --- a/site/src/theme/overrides.ts +++ b/site/src/theme/overrides.ts @@ -44,6 +44,11 @@ export const getOverrides = (palette: PaletteOptions) => { // Gives the appearance of a border! borderRadius: 2, border: `1px solid ${palette.divider}`, + + "& td": { + paddingTop: 16, + paddingBottom: 16, + }, }, }, MuiTableCell: {