From 617dd33f1207240c85ddd030858c431b5703d22f Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Thu, 17 Aug 2023 21:06:51 +0000 Subject: [PATCH 1/2] fix: `displayName` should always be primary in `ParameterLabel` component --- site/src/components/Markdown/Markdown.tsx | 5 +++++ .../src/components/RichParameterInput/RichParameterInput.tsx | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/site/src/components/Markdown/Markdown.tsx b/site/src/components/Markdown/Markdown.tsx index 85261e5993a57..d5a72191ccdfa 100644 --- a/site/src/components/Markdown/Markdown.tsx +++ b/site/src/components/Markdown/Markdown.tsx @@ -116,6 +116,11 @@ const useStyles = makeStyles((theme) => ({ }, "& p": { + marginTop: 0, + marginBottom: 0, + }, + + "& p + *": { marginTop: 0, marginBottom: theme.spacing(2), }, diff --git a/site/src/components/RichParameterInput/RichParameterInput.tsx b/site/src/components/RichParameterInput/RichParameterInput.tsx index 3dd5f3f70c4da..7d5b83894f09e 100644 --- a/site/src/components/RichParameterInput/RichParameterInput.tsx +++ b/site/src/components/RichParameterInput/RichParameterInput.tsx @@ -43,8 +43,8 @@ const ParameterLabel: FC = ({ id, parameter }) => { {hasDescription ? ( - {displayName} - + {displayName} + {parameter.description} From 7dba3caaf55ebc6e2edf3e639e8dbac2a528b4cc Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Fri, 18 Aug 2023 00:51:14 +0000 Subject: [PATCH 2/2] maybe this looks right --- site/src/components/Markdown/Markdown.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/src/components/Markdown/Markdown.tsx b/site/src/components/Markdown/Markdown.tsx index d5a72191ccdfa..0573901802a6f 100644 --- a/site/src/components/Markdown/Markdown.tsx +++ b/site/src/components/Markdown/Markdown.tsx @@ -117,12 +117,12 @@ const useStyles = makeStyles((theme) => ({ "& p": { marginTop: 0, - marginBottom: 0, + marginBottom: theme.spacing(2), }, - "& p + *": { + "& p:only-child": { marginTop: 0, - marginBottom: theme.spacing(2), + marginBottom: 0, }, "& ul, & ol": {