Skip to content

Commit 3aa1612

Browse files
committed
fix linting
1 parent 152138d commit 3aa1612

File tree

6 files changed

+28
-64
lines changed

6 files changed

+28
-64
lines changed

dotcom-rendering/src/components/ArticleMeta.apps.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { css } from '@emotion/react';
22
import { isUndefined } from '@guardian/libs';
3-
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
43
import { from, space, until } from '@guardian/source/foundations';
4+
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
55
import type { ReactNode } from 'react';
66
import { grid } from '../grid';
77
import { interactiveLegacyClasses } from '../layouts/lib/interactiveLegacyStyling';

dotcom-rendering/src/layouts/CommentLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { css } from '@emotion/react';
22
import { isUndefined } from '@guardian/libs';
3-
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
43
import {
54
from,
65
palette as sourcePalette,
76
until,
87
} from '@guardian/source/foundations';
8+
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
99
import { AdPortals } from '../components/AdPortals.importable';
1010
import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web';
1111
import { AppsFooter } from '../components/AppsFooter.importable';

dotcom-rendering/src/layouts/ImmersiveLayout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import { css } from '@emotion/react';
22
import { isUndefined } from '@guardian/libs';
3-
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
43
import {
54
from,
65
palette as sourcePalette,
76
space,
87
until,
98
} from '@guardian/source/foundations';
10-
import type { RenderingTarget } from 'src/types/renderingTarget';
9+
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
1110
import { AdPortals } from '../components/AdPortals.importable';
1211
import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web';
1312
import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer';
@@ -58,6 +57,7 @@ import { parse } from '../lib/slot-machine-flags';
5857
import type { NavType } from '../model/extract-nav';
5958
import { palette as themePalette } from '../palette';
6059
import type { ArticleDeprecated } from '../types/article';
60+
import type { RenderingTarget } from '../types/renderingTarget';
6161
import { BannerWrapper, Stuck } from './lib/stickiness';
6262

6363
const ImmersiveGrid = ({

dotcom-rendering/src/layouts/InteractiveLayout.tsx

Lines changed: 22 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
palette as sourcePalette,
66
until,
77
} from '@guardian/source/foundations';
8-
import { Hide } from '@guardian/source/react-components';
98
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
109
import React from 'react';
1110
import { AdPortals } from '../components/AdPortals.importable';
@@ -412,63 +411,28 @@ export const InteractiveLayout = (props: WebProps | AppsProps) => {
412411
<GridItem area="meta" element="aside">
413412
<div css={maxWidth}>
414413
{isApps ? (
415-
<>
416-
<Hide from="leftCol">
417-
<ArticleMetaApps
418-
branding={branding}
419-
format={format}
420-
byline={article.byline}
421-
tags={article.tags}
422-
primaryDateline={
423-
article.webPublicationDateDisplay
424-
}
425-
secondaryDateline={
426-
article.webPublicationSecondaryDateDisplay
427-
}
428-
isCommentable={
429-
article.isCommentable
430-
}
431-
discussionApiUrl={
432-
article.config
433-
.discussionApiUrl
434-
}
435-
shortUrlId={
436-
article.config
437-
.shortUrlId
438-
}
439-
pageId={
440-
article.config.pageId
441-
}
442-
></ArticleMetaApps>
443-
</Hide>
444-
<Hide until="leftCol">
445-
<ArticleMeta
446-
branding={branding}
447-
format={format}
448-
pageId={article.pageId}
449-
webTitle={article.webTitle}
450-
byline={article.byline}
451-
tags={article.tags}
452-
primaryDateline={
453-
article.webPublicationDateDisplay
454-
}
455-
secondaryDateline={
456-
article.webPublicationSecondaryDateDisplay
457-
}
458-
isCommentable={
459-
article.isCommentable
460-
}
461-
discussionApiUrl={
462-
article.config
463-
.discussionApiUrl
464-
}
465-
shortUrlId={
466-
article.config
467-
.shortUrlId
468-
}
469-
/>
470-
</Hide>
471-
</>
414+
<ArticleMetaApps
415+
branding={branding}
416+
format={format}
417+
byline={article.byline}
418+
tags={article.tags}
419+
primaryDateline={
420+
article.webPublicationDateDisplay
421+
}
422+
secondaryDateline={
423+
article.webPublicationSecondaryDateDisplay
424+
}
425+
isCommentable={
426+
article.isCommentable
427+
}
428+
discussionApiUrl={
429+
article.config.discussionApiUrl
430+
}
431+
shortUrlId={
432+
article.config.shortUrlId
433+
}
434+
pageId={article.config.pageId}
435+
></ArticleMetaApps>
472436
) : (
473437
<ArticleMeta
474438
branding={branding}

dotcom-rendering/src/layouts/ShowcaseLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { css } from '@emotion/react';
22
import { isUndefined } from '@guardian/libs';
3-
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
43
import {
54
from,
65
palette as sourcePalette,
76
until,
87
} from '@guardian/source/foundations';
8+
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
99
import { AdPortals } from '../components/AdPortals.importable';
1010
import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web';
1111
import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer';

dotcom-rendering/src/layouts/StandardLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { css } from '@emotion/react';
22
import { isUndefined } from '@guardian/libs';
3-
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
43
import {
54
from,
65
palette as sourcePalette,
76
until,
87
} from '@guardian/source/foundations';
8+
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
99
import { AdPortals } from '../components/AdPortals.importable';
1010
import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web';
1111
import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer';

0 commit comments

Comments
 (0)