{
css={css`
${textSansBold17}
`}
- fill={theme.text}
+ fill={theme.textColor}
>
{centerLetter}
)}
- {renderOuterLetters({ letters: wordWheelLetters, fill: theme.text })}
+ {renderOuterLetters({ letters: wordWheelLetters, fill: theme.textColor })}
);
};
diff --git a/libs/@guardian/react-crossword/src/layouts/ScreenLayout.tsx b/libs/@guardian/react-crossword/src/layouts/ScreenLayout.tsx
index b53ae6ae3..c474c0def 100644
--- a/libs/@guardian/react-crossword/src/layouts/ScreenLayout.tsx
+++ b/libs/@guardian/react-crossword/src/layouts/ScreenLayout.tsx
@@ -15,8 +15,8 @@ const CluesHeader = memo(({ direction }: { direction: Direction }) => {
{
- const { text, clueMinWidth, clueMaxWidth } = useTheme();
+ const { textColor, clueMinWidth, clueMaxWidth } = useTheme();
const { showAnagramHelper } = useUIState();
const theme = useTheme();
- const { gutter, cellSize } = useTheme();
+ const { gridGutterSize, gridCellSize } = useTheme();
const { dimensions } = useData();
const gridWidth = Math.max(
- (cellSize + gutter) * dimensions.cols + gutter,
+ (gridCellSize + gridGutterSize) * dimensions.cols + gridGutterSize,
300,
);
const oneColWidth = gridWidth + clueMinWidth;
@@ -51,7 +51,7 @@ const Layout = ({
return (
diff --git a/libs/@guardian/react-crossword/src/theme.ts b/libs/@guardian/react-crossword/src/theme.ts
index 1528be6cf..4a203b36f 100644
--- a/libs/@guardian/react-crossword/src/theme.ts
+++ b/libs/@guardian/react-crossword/src/theme.ts
@@ -2,21 +2,24 @@ import { palette } from '@guardian/source/foundations';
import type { Theme } from './@types/crossword';
export const defaultTheme: Theme = {
- background: palette.neutral[7],
- text: palette.neutral[10],
- errorText: 'red',
- provisionalText: palette.neutral[60],
- unsavedBackground: 'lightPink',
- foreground: palette.neutral[100],
- gutter: 1,
- highlight: 'lightpink',
- focus: 'lime',
- active: 'deeppink',
- cellSize: 32,
- buttonBackground: 'hotpink',
- buttonBackgroundHover: 'lightpink',
- border: 'orchid',
- anagramHelperBackground: 'floralwhite',
+ gridBackgroundColor: palette.neutral[7],
+ gridForegroundColor: palette.neutral[100],
+ gridGutterSize: 1,
+ gridCellSize: 32,
+
+ textColor: palette.neutral[10],
+ focusColor: 'lime',
+ selectedColor: 'deeppink',
+ relatedColor: 'lightpink',
+
+ buttonBackgroundColor: 'hotpink',
+ buttonBackgroundHoverColor: 'lightpink',
+
+ borderColor: 'orchid',
+
clueMinWidth: 240,
clueMaxWidth: 480,
+
+ anagramHelperBackgroundColor: 'floralwhite',
+ anagramHelperCandidateTextColor: palette.neutral[60],
};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2c1ce62cc..a60de7727 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -507,9 +507,6 @@ importers:
libs/@guardian/react-crossword:
dependencies:
- '@guardian/source-development-kitchen':
- specifier: ^13.1.0
- version: link:../source-development-kitchen
tslib:
specifier: 2.6.2
version: 2.6.2