diff --git a/site/src/components/PageHeader/PageHeader.tsx b/site/src/components/PageHeader/PageHeader.tsx index 3944f3405072d..d6196142f5018 100644 --- a/site/src/components/PageHeader/PageHeader.tsx +++ b/site/src/components/PageHeader/PageHeader.tsx @@ -52,7 +52,7 @@ const useStyles = makeStyles((theme) => ({ display: "flex", alignItems: "center", paddingTop: theme.spacing(6), - paddingBottom: theme.spacing(5), + paddingBottom: theme.spacing(6), [theme.breakpoints.down("sm")]: { flexDirection: "column", diff --git a/site/src/components/Pill/Pill.tsx b/site/src/components/Pill/Pill.tsx index 6b95ebc27c82e..e7861182418f2 100644 --- a/site/src/components/Pill/Pill.tsx +++ b/site/src/components/Pill/Pill.tsx @@ -1,6 +1,5 @@ import { makeStyles, Theme } from "@material-ui/core/styles" import { FC } from "react" -import { MONOSPACE_FONT_FAMILY } from "theme/constants" import { PaletteIndex } from "theme/palettes" import { combineClasses } from "util/combineClasses" @@ -28,14 +27,12 @@ export const Pill: FC = (props) => { const useStyles = makeStyles((theme) => ({ wrapper: { - fontFamily: MONOSPACE_FONT_FAMILY, display: "inline-flex", alignItems: "center", borderWidth: 1, borderStyle: "solid", borderRadius: 99999, - fontSize: 14, - fontWeight: 500, + fontSize: 12, color: "#FFF", height: theme.spacing(3), paddingLeft: ({ icon }) => diff --git a/site/src/components/TemplateStats/TemplateStats.tsx b/site/src/components/TemplateStats/TemplateStats.tsx index 3bc943479593c..1ae33543d8ead 100644 --- a/site/src/components/TemplateStats/TemplateStats.tsx +++ b/site/src/components/TemplateStats/TemplateStats.tsx @@ -6,7 +6,6 @@ import { formatTemplateActiveDevelopers, } from "util/templates" import { Template, TemplateVersion } from "../../api/typesGenerated" -import { MONOSPACE_FONT_FAMILY } from "../../theme/constants" const Language = { usedByLabel: "Used by", @@ -32,7 +31,7 @@ export const TemplateStats: FC = ({ return (
- {Language.usedByLabel} + {Language.usedByLabel}: {formatTemplateActiveDevelopers(template.active_user_count)}{" "} @@ -41,29 +40,27 @@ export const TemplateStats: FC = ({ : Language.developerPlural}
-
- {Language.buildTimeLabel} + {Language.buildTimeLabel}: {formatTemplateBuildTime(template.build_time_stats.start_ms)}{" "}
-
- {Language.activeVersionLabel} + + {Language.activeVersionLabel}: + {activeVersion.name}
-
- {Language.lastUpdateLabel} + {Language.lastUpdateLabel}: {createDayString(template.updated_at)}
-
- {Language.createdByLabel} + {Language.createdByLabel}: {template.created_by_name}
@@ -74,12 +71,10 @@ const useStyles = makeStyles((theme) => ({ stats: { paddingLeft: theme.spacing(2), paddingRight: theme.spacing(2), - backgroundColor: theme.palette.background.paper, borderRadius: theme.shape.borderRadius, display: "flex", alignItems: "center", color: theme.palette.text.secondary, - fontFamily: MONOSPACE_FONT_FAMILY, border: `1px solid ${theme.palette.divider}`, [theme.breakpoints.down("sm")]: { display: "block", @@ -87,33 +82,21 @@ const useStyles = makeStyles((theme) => ({ }, statItem: { - minWidth: "15%", padding: theme.spacing(2), paddingTop: theme.spacing(1.75), + display: "flex", + alignItems: "baseline", + gap: theme.spacing(1), }, statsLabel: { - fontSize: 12, - textTransform: "uppercase", display: "block", - fontWeight: 600, wordWrap: "break-word", }, statsValue: { - fontSize: 16, - marginTop: theme.spacing(0.25), display: "block", wordWrap: "break-word", - }, - - statsDivider: { - width: 1, - height: theme.spacing(5), - backgroundColor: theme.palette.divider, - marginRight: theme.spacing(2), - [theme.breakpoints.down("sm")]: { - display: "none", - }, + color: theme.palette.text.primary, }, })) diff --git a/site/src/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx index 564c1c910cd75..c6120796791ca 100644 --- a/site/src/components/Workspace/Workspace.tsx +++ b/site/src/components/Workspace/Workspace.tsx @@ -179,7 +179,7 @@ export const Workspace: FC> = ({ {buildError} {cancellationError} diff --git a/site/src/components/WorkspaceStats/WorkspaceStats.tsx b/site/src/components/WorkspaceStats/WorkspaceStats.tsx index 006b24a9da950..8fac5bede3b4c 100644 --- a/site/src/components/WorkspaceStats/WorkspaceStats.tsx +++ b/site/src/components/WorkspaceStats/WorkspaceStats.tsx @@ -7,7 +7,6 @@ import { combineClasses } from "util/combineClasses" import { createDayString } from "util/createDayString" import { getDisplayWorkspaceBuildInitiatedBy } from "util/workspace" import { Workspace } from "../../api/typesGenerated" -import { MONOSPACE_FONT_FAMILY } from "../../theme/constants" const Language = { workspaceDetails: "Workspace Details", @@ -17,7 +16,7 @@ const Language = { lastBuiltLabel: "Last Built", outdated: "Outdated", upToDate: "Up to date", - byLabel: "Last Built by", + byLabel: "Last built by", } export interface WorkspaceStatsProps { @@ -38,7 +37,7 @@ export const WorkspaceStats: FC = ({ return (
- {Language.templateLabel} + {Language.templateLabel}: = ({ {workspace.template_name}
-
- {Language.versionLabel} + {Language.versionLabel}: {workspace.outdated ? ( @@ -66,16 +64,14 @@ export const WorkspaceStats: FC = ({ )}
-
- {Language.lastBuiltLabel} + {Language.lastBuiltLabel}: {createDayString(workspace.latest_build.created_at)}
-
- {Language.byLabel} + {Language.byLabel}: {initiatedBy}
@@ -86,13 +82,11 @@ const useStyles = makeStyles((theme) => ({ stats: { paddingLeft: theme.spacing(2), paddingRight: theme.spacing(2), - backgroundColor: theme.palette.background.paper, borderRadius: theme.shape.borderRadius, border: `1px solid ${theme.palette.divider}`, display: "flex", alignItems: "center", color: theme.palette.text.secondary, - fontFamily: MONOSPACE_FONT_FAMILY, margin: "0px", [theme.breakpoints.down("sm")]: { display: "block", @@ -100,34 +94,23 @@ const useStyles = makeStyles((theme) => ({ }, statItem: { - minWidth: "16%", padding: theme.spacing(2), paddingTop: theme.spacing(1.75), + display: "flex", + alignItems: "baseline", + gap: theme.spacing(1), }, statsLabel: { - fontSize: 12, - textTransform: "uppercase", display: "block", - fontWeight: 600, wordWrap: "break-word", }, statsValue: { - fontSize: 16, marginTop: theme.spacing(0.25), display: "block", wordWrap: "break-word", - }, - - statsDivider: { - width: 1, - height: theme.spacing(5), - backgroundColor: theme.palette.divider, - marginRight: theme.spacing(2), - [theme.breakpoints.down("sm")]: { - display: "none", - }, + color: theme.palette.text.primary, }, capitalize: { diff --git a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.tsx b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.tsx index b80593f3f523a..2ceb20463e75e 100644 --- a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.tsx +++ b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.tsx @@ -54,13 +54,13 @@ export const TemplateSummaryPageView: FC< } return ( - + {deleteError} - {templateDAUs && } + {templateDAUs && }