Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dark mode - Accordion 🪗 #9274

Merged
merged 4 commits into from
Oct 25, 2023
Merged

Dark mode - Accordion 🪗 #9274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2689a9
support dark theme and stories
DanielCliftonGuardian Oct 23, 2023
56ad182
Update Accordion.tsx
DanielCliftonGuardian Oct 23, 2023
9bebc70
Merge branch 'main' into accordion-dark-mode
DanielCliftonGuardian Oct 25, 2023
09e9959
remove obsolete wording
DanielCliftonGuardian Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions dotcom-rendering/src/components/Accordion.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { css } from '@emotion/react';
import type { SerializedStyles } from '@emotion/react';
import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs';
import { body, breakpoints, from, space } from '@guardian/source-foundations';
import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator';
import { Accordion } from './Accordion';

const textStyle = css`
Expand All @@ -26,6 +28,12 @@ const adviceColourAboveTablet: SerializedStyles = css`
}
`;

const articleFormat: ArticleFormat = {
design: ArticleDesign.Standard,
display: ArticleDisplay.Standard,
theme: Pillar.News,
};

const accordionContent = (
<>
<p css={[textStyle, adviceColourAboveTablet]}>
Expand Down Expand Up @@ -59,6 +67,7 @@ export default {
viewports: [breakpoints.mobile, breakpoints.tablet],
},
},
decorators: [splitTheme(articleFormat)],
};

export const Default = () => (
Expand Down
22 changes: 8 additions & 14 deletions dotcom-rendering/src/components/Accordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
import { css } from '@emotion/react';
import type { SerializedStyles } from '@emotion/react';
import {
background,
focusHalo,
from,
headline,
neutral,
space,
} from '@guardian/source-foundations';
import { focusHalo, from, headline, space } from '@guardian/source-foundations';
import {
SvgChevronDownSingle,
SvgChevronUpSingle,
} from '@guardian/source-react-components';
import { palette } from '../palette';

interface Props {
children: React.ReactNode;
Expand All @@ -34,14 +28,14 @@ const titleRowStyles = css`
position: relative;
display: block;
align-items: center;
border-top: ${neutral[86]} 1px solid;
background-color: ${neutral[100]};
border-top: ${palette('--accordion-title-row-border-top')} 1px solid;
background-color: ${palette('--accordion-title-row-background')};
padding: ${space[2]}px ${space[2]}px ${space[2]}px ${space[3]}px;
&:focus {
${focusHalo};
}
path {
fill: ${neutral[46]};
fill: ${palette('--accordion-title-row-fill')};
}
svg {
height: 2rem;
Expand All @@ -57,7 +51,7 @@ const titleRowStyles = css`

const titleStyle = css`
${headline.xxsmall({ fontWeight: 'bold', lineHeight: 'tight' })};
color: ${neutral[7]};
color: ${palette('--accordion-title')};
`;

const arrowPosition: SerializedStyles = css`
Expand All @@ -75,14 +69,14 @@ const backgroundColour = (
): SerializedStyles => {
if (context === 'keyEvents') {
return css`
background-color: ${background.primary};
background-color: ${palette('--accordion-key-events-background')};
${from.desktop} {
background-color: transparent;
}
`;
}
return css`
background-color: ${neutral[97]};
background-color: ${palette('--accordion-live-feed-background')};
${from.desktop} {
background-color: transparent;
}
Expand Down
39 changes: 39 additions & 0 deletions dotcom-rendering/src/palette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,21 @@ const starRatingBackgroundColourLight = (): string =>
const starRatingBackgroundColourDark = (): string =>
sourcePalette.brandAlt[200];

const accordionTitleRowFillLight = (): string => sourcePalette.neutral[46];
const accordionTitleRowFillDark = (): string => sourcePalette.neutral[60];
const accordionTitleRowBackgroundLight = (): string =>
sourcePalette.neutral[100];
const accordionTitleRowBackgroundDark = (): string => sourcePalette.neutral[10];
const accordionTitleRowBorderTopLight = (): string => sourcePalette.neutral[86];
const accordionTitleRowBorderTopDark = (): string => sourcePalette.neutral[20];
const accordionTitleLight = (): string => sourcePalette.neutral[7];
const accordionTitleDark = (): string => sourcePalette.neutral[86];
const accordionKeyEventsBackgroundLight = (): string =>
sourcePalette.neutral[100];
const accordionBackgroundDark = (): string => sourcePalette.neutral[10];
const accordionLiveFeedBackgroundLight = (): string =>
sourcePalette.neutral[97];

// ----- Palette ----- //

/**
Expand Down Expand Up @@ -97,6 +112,30 @@ const paletteColours = {
light: starRatingBackgroundColourLight,
dark: starRatingBackgroundColourDark,
},
'--accordion-title-row-fill': {
light: accordionTitleRowFillLight,
dark: accordionTitleRowFillDark,
},
'--accordion-title-row-background': {
light: accordionTitleRowBackgroundLight,
dark: accordionTitleRowBackgroundDark,
},
'--accordion-title-row-border-top': {
light: accordionTitleRowBorderTopLight,
dark: accordionTitleRowBorderTopDark,
},
'--accordion-title': {
light: accordionTitleLight,
dark: accordionTitleDark,
},
'--accordion-key-events-background': {
light: accordionKeyEventsBackgroundLight,
dark: accordionBackgroundDark,
},
'--accordion-live-feed-background': {
light: accordionLiveFeedBackgroundLight,
dark: accordionBackgroundDark,
},
} satisfies PaletteColours;

/**
Expand Down
Loading