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

Jump to bottom

Update link colours for audio articles #12608

Merged
merged 13 commits into from
Oct 24, 2024
Merged

Update link colours for audio articles #12608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
112f300
update links in Audio components to use dark theme colors
oliverabrahams Oct 21, 2024
8cbb7a6
update links in Audio components to use dark theme colors
oliverabrahams Oct 21, 2024
955ed4a
update links in Audio components to use dark theme colors
oliverabrahams Oct 21, 2024
a932d0c
Apply suggestions from code review
oliverabrahams Oct 21, 2024
0258ad3
removed unused args
oliverabrahams Oct 21, 2024
21d4cbe
Merge branch 'main' into e2e/link-colours-audio
oliverabrahams Oct 21, 2024
de07663
Merge branch 'main' into e2e/link-colours-audio
oliverabrahams Oct 22, 2024
c856c76
Merge branch 'main' into e2e/link-colours-audio
oliverabrahams Oct 22, 2024
52f40f5
Add option to ignore designs in function getAllDesigns
oliverabrahams Oct 24, 2024
a6bd535
refactor change name of function which returns formats
oliverabrahams Oct 24, 2024
6df4d59
move audio colour decision up in the chain so it overrides all others
oliverabrahams Oct 24, 2024
9dde780
rollback changes to articleFormat.ts
oliverabrahams Oct 24, 2024
6b1b221
rollback changes to articleFormat.ts
oliverabrahams Oct 24, 2024
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
10 changes: 10 additions & 0 deletions dotcom-rendering/src/components/BlockquoteBlockComponent.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,16 @@ export const QuotedDeadBlogDesignAllThemes = {
},
} satisfies Story;

export const QuotedCommentDesignAudioAllThemes = {
args: QuotedStandardDesignAllThemes.args,
parameters: {
formats: getAllThemes({
design: ArticleDesign.Audio,
display: ArticleDisplay.Standard,
}),
},
} satisfies Story;

export const QuotedAllDesignsNewsTheme = {
args: QuotedStandardDesignAllThemes.args,
parameters: {
Expand Down
17 changes: 15 additions & 2 deletions dotcom-rendering/src/palette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3131,6 +3131,9 @@ const articleSectionTitleDark: PaletteFunction = () =>
sourcePalette.neutral[86];

const articleLinkTextLight: PaletteFunction = ({ design, theme }) => {
if (design === ArticleDesign.Audio) {
return sourcePalette.neutral[86];
}
if (design === ArticleDesign.Analysis) return sourcePalette.news[300];
switch (theme) {
case Pillar.Lifestyle:
Expand Down Expand Up @@ -3170,8 +3173,10 @@ const articleLinkTextDark: PaletteFunction = ({ display, theme }) => {
};

const articleLinkBorderLight: PaletteFunction = ({ design, theme }) => {
if (design === ArticleDesign.Audio) {
return sourcePalette.neutral[46];
}
if (theme === ArticleSpecial.Labs) return sourcePalette.neutral[60];

if (theme === ArticleSpecial.SpecialReport) {
return sourcePalette.specialReport[300];
}
Expand Down Expand Up @@ -3205,6 +3210,9 @@ const articleMetaLinesDark: PaletteFunction = ({ design }) => {
};

const articleLinkHoverLight: PaletteFunction = ({ design, theme }) => {
if (design === ArticleDesign.Audio) {
return sourcePalette.neutral[86];
}
switch (design) {
case ArticleDesign.DeadBlog:
switch (theme) {
Expand Down Expand Up @@ -3274,7 +3282,12 @@ const articleLinkHoverLight: PaletteFunction = ({ design, theme }) => {
const articleLinkHoverDark: PaletteFunction = (f) => articleLinkTextDark(f);

const articleLinkBorderHoverLight: PaletteFunction = ({ design, theme }) => {
if (theme === ArticleSpecial.Labs) return sourcePalette.neutral[7];
if (design === ArticleDesign.Audio) {
return sourcePalette.neutral[86];
}
if (theme === ArticleSpecial.Labs) {
return sourcePalette.neutral[7];
}
if (theme === ArticleSpecial.SpecialReport) {
return sourcePalette.specialReport[100];
}
Expand Down
Loading