From 9e64b7758bb49dbed43bf2c13873a5cec8e14632 Mon Sep 17 00:00:00 2001 From: Peter Hudec Date: Tue, 19 Mar 2024 16:39:53 +0000 Subject: [PATCH 1/3] Enforce list-style: none in Footer --- src/client/components/Footer/index.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/components/Footer/index.jsx b/src/client/components/Footer/index.jsx index fd2743c19df..2c87fb33853 100644 --- a/src/client/components/Footer/index.jsx +++ b/src/client/components/Footer/index.jsx @@ -40,6 +40,7 @@ const StyleList = styled.ul` display: flex; flex: 1; flex-direction: row; + list-style: none; li + li { margin-left: ${SPACING.SCALE_3}; } From 5d1440d2ee9bdfc4d2fef5b05f98072a0cd5ef33 Mon Sep 17 00:00:00 2001 From: Peter Hudec Date: Tue, 19 Mar 2024 16:41:22 +0000 Subject: [PATCH 2/3] Removed reliance on govuk-heading-m class Removed redundant CSS declarations --- .../components/Form/elements/FieldWrapper/index.jsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/client/components/Form/elements/FieldWrapper/index.jsx b/src/client/components/Form/elements/FieldWrapper/index.jsx index 23117e7a35f..bbcc48fbd41 100644 --- a/src/client/components/Form/elements/FieldWrapper/index.jsx +++ b/src/client/components/Form/elements/FieldWrapper/index.jsx @@ -68,16 +68,11 @@ const StyledFieldsetNoStyling = styled('fieldset')` ` const StyledLegend = styled('legend')` - box-sizing: border-box; - display: table; - white-space: normal; + font-weight: 700; font-size: 19px; padding: 0; margin: 0; padding-bottom: ${SPACING.SCALE_1}; - * { - margin-bottom: ${SPACING.SCALE_1} !important; - } ${(props) => props.error && ` @@ -137,7 +132,6 @@ const FieldInner = ({ // FIXME: This shouldn't be a fieldset Date: Tue, 19 Mar 2024 16:43:15 +0000 Subject: [PATCH 3/3] Fixed a number of styling issues in ExportWins/Review/Layout --- .../components/Form/elements/FieldWrapper/index.jsx | 1 + src/client/modules/ExportWins/Review/Layout.jsx | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/client/components/Form/elements/FieldWrapper/index.jsx b/src/client/components/Form/elements/FieldWrapper/index.jsx index bbcc48fbd41..9ae5cd57f15 100644 --- a/src/client/components/Form/elements/FieldWrapper/index.jsx +++ b/src/client/components/Form/elements/FieldWrapper/index.jsx @@ -70,6 +70,7 @@ const StyledFieldsetNoStyling = styled('fieldset')` const StyledLegend = styled('legend')` font-weight: 700; font-size: 19px; + line-height: 1.25; padding: 0; margin: 0; padding-bottom: ${SPACING.SCALE_1}; diff --git a/src/client/modules/ExportWins/Review/Layout.jsx b/src/client/modules/ExportWins/Review/Layout.jsx index b01d3eab76c..98eddd6fc7e 100644 --- a/src/client/modules/ExportWins/Review/Layout.jsx +++ b/src/client/modules/ExportWins/Review/Layout.jsx @@ -10,7 +10,7 @@ const Grid = styled.div({ minHeight: '100vh', display: 'grid', gridTemplateRows: 'auto auto 1fr minmax(min-content, 30px)', - gridTemplateColumns: `1fr min(100vw, calc(960px + ${SPACING.SCALE_3} * 2)) 1fr`, + gridTemplateColumns: `1fr min(100vw, calc(960px + ${SPACING.SCALE_5} * 2)) 1fr`, gridTemplateAreas: ` ". main-bar ." ". header ." @@ -31,7 +31,7 @@ const MainBar = styled.div({ fontWeight: FONT_WEIGHTS.bold, fontSize: FONT_SIZE.SIZE_27, color: WHITE, - padding: SPACING.SCALE_3, + padding: SPACING.SCALE_5, }) const HeaderBackground = styled.div({ @@ -43,7 +43,7 @@ const HeaderBackground = styled.div({ const Header = styled.header({ gridArea: 'header', alignSelf: 'center', - padding: SPACING.SCALE_3, + padding: SPACING.SCALE_5, paddingBottom: SPACING.SCALE_5, }) @@ -54,6 +54,9 @@ const Main = styled.main({ const GridCellFooter = styled(Footer)({ gridArea: 'footer', + ul: { + padding: 0, + }, }) const Title = styled(H1)({