Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions dotcom-rendering/src/components/ArticleMeta.web.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { css } from '@emotion/react';
import { between, from, space, until } from '@guardian/source/foundations';
import { Hide } from '@guardian/source/react-components';
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
import type { FEArticle } from '../frontend/feArticle';
import { interactiveLegacyClasses } from '../layouts/lib/interactiveLegacyStyling';
Expand All @@ -17,6 +18,7 @@ import type { FEElement } from '../types/content';
import type { Podcast, TagType } from '../types/tag';
import { Avatar } from './Avatar';
import { Branding } from './Branding.importable';
import { Caption } from './Caption';
import { CommentCount } from './CommentCount.importable';
import { useConfig } from './ConfigContext';
import { Contributor } from './Contributor';
Expand All @@ -41,6 +43,7 @@ type Props = {
isCommentable: boolean;
mainMediaElements?: FEElement[];
crossword?: FEArticle['crossword'];
captionText?: string;
};

const meta = (format: ArticleFormat) => {
Expand Down Expand Up @@ -324,6 +327,7 @@ export const ArticleMeta = ({
isCommentable,
mainMediaElements,
crossword,
captionText,
}: Props) => {
const soleContributor = getSoleContributor(tags, byline);
const authorName = soleContributor?.title ?? 'Author Image';
Expand Down Expand Up @@ -404,6 +408,21 @@ export const ArticleMeta = ({
/>
)}

{format.design === ArticleDesign.Gallery ? (
<Hide from="leftCol">
<Caption
captionText={captionText}
format={format}
isMainMedia={true}
/>
<StraightLines
cssOverrides={stretchLines}
count={4}
color={themePalette('--straight-lines')}
/>
</Hide>
) : null}

{crossword?.creator && (
<CrosswordSetter
setter={crossword.creator.name}
Expand Down
4 changes: 4 additions & 0 deletions dotcom-rendering/src/components/Standfirst.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ const decideFont = ({ display, design, theme }: ArticleFormat) => {
}
return css`
${headlineMedium20}

${from.leftCol} {
${headlineMedium24}
}
`;
case ArticleDesign.Obituary:
case ArticleDesign.Comment:
Expand Down
67 changes: 56 additions & 11 deletions dotcom-rendering/src/layouts/GalleryLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import {
from,
palette as sourcePalette,
space,
until,
} from '@guardian/source/foundations';
import { Hide } from '@guardian/source/react-components';
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
import { Fragment } from 'react';
import { AdPlaceholder } from '../components/AdPlaceholder.apps';
import { AdPortals } from '../components/AdPortals.importable';
Expand Down Expand Up @@ -67,15 +69,40 @@ const headerStyles = css`
}
`;

const metaAndDisclaimerContainer = css`
const captionContainer = css`
${grid.column.left}

${until.leftCol} {
${grid.column.centre};
}
grid-row: 8;
`;

const standfirstStyles = css`
${grid.column.centre}

${from.leftCol} {
width: 75%;
grid-row: 10;
}
`;

const metaAndDisclaimerContainer = css`
${grid.column.centre};

${from.leftCol} {
${grid.column.left}
grid-row: 10;
padding-top: 10px;
}

padding-bottom: ${space[6]}px;
${from.tablet} {
position: relative;
&::before {
content: '';
position: absolute;
left: -10px;
left: -20px;
top: 0;
bottom: 0;
width: 1px;
Expand Down Expand Up @@ -266,16 +293,33 @@ export const GalleryLayout = (props: WebProps | AppProps) => {
frontendData.webPublicationDateDeprecated
}
/>
<Standfirst
format={format}
standfirst={frontendData.standfirst}
/>
<Caption
captionText={captionText}
format={format}
isMainMedia={true}
/>
<div css={standfirstStyles}>
<Standfirst
format={format}
standfirst={frontendData.standfirst}
/>
</div>

<div css={captionContainer}>
<Hide until="leftCol">
<Caption
captionText={captionText}
format={format}
isMainMedia={true}
/>
</Hide>
</div>

<div css={metaAndDisclaimerContainer}>
<div>
<Hide until="leftCol">
<StraightLines
count={4}
color={palette('--straight-lines')}
/>
</Hide>
</div>

{isWeb ? (
<ArticleMeta
branding={
Expand All @@ -297,6 +341,7 @@ export const GalleryLayout = (props: WebProps | AppProps) => {
isCommentable={frontendData.isCommentable}
discussionApiUrl={discussionApiUrl}
shortUrlId={shortUrlId}
captionText={captionText}
/>
) : null}
{isApps ? (
Expand Down
2 changes: 1 addition & 1 deletion dotcom-rendering/src/paletteDeclarations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3443,7 +3443,7 @@ const articleBorderDark: PaletteFunction = () => sourcePalette.neutral[20];

const straightLinesLight: PaletteFunction = (format) => {
if (format.design === ArticleDesign.Gallery) {
return sourcePalette.neutral[20];
return sourcePalette.neutral[38];
}
if (format.theme === ArticleSpecial.SpecialReportAlt) {
return transparentColour(sourcePalette.neutral[60], 0.3);
Expand Down
Loading