Skip to content

Commit eceff92

Browse files
committed
adjust positioning of expanded details component, rename palette to schemePalette for clarity
1 parent bd9bebe commit eceff92

File tree

1 file changed

+35
-32
lines changed

1 file changed

+35
-32
lines changed

dotcom-rendering/src/components/LabsPageHeader.tsx

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import { grid } from '../grid';
1515
import type { EditionId } from '../lib/edition';
1616
import { getLabsUrlSuffix } from '../lib/labs';
1717
import { LABS_HEADER_HEIGHT } from '../lib/labs-constants';
18-
import { palette } from '../palette';
18+
import { palette as schemePalette } from '../palette';
1919
import { Details } from './Details';
2020
import { LabsLogo } from './LabsLogo';
2121

2222
const headerStyles = css`
23-
color: ${palette('--labs-header-title')};
24-
background-color: ${palette('--labs-header-background')};
23+
color: ${schemePalette('--labs-header-title')};
24+
background-color: ${schemePalette('--labs-header-background')};
2525
border-bottom: 1px solid var(--article-border);
2626
`;
2727

@@ -30,8 +30,8 @@ const headerInnerStyles = css`
3030
${grid.paddedContainer}
3131
3232
${from.tablet} {
33-
border-left: 1px solid ${palette('--article-border')};
34-
border-right: 1px solid ${palette('--article-border')};
33+
border-left: 1px solid ${schemePalette('--article-border')};
34+
border-right: 1px solid ${schemePalette('--article-border')};
3535
}
3636
`;
3737

@@ -44,26 +44,6 @@ const leftContentStyles = css`
4444
display: flex;
4545
`;
4646

47-
const detailsPositionStyles = css`
48-
top: 40px;
49-
left: 0px;
50-
51-
${from.mobile} {
52-
left: -108px;
53-
}
54-
55-
${from.mobileLandscape} {
56-
left: -127.5px;
57-
}
58-
59-
${from.tablet} {
60-
max-width: ${breakpoints.tablet}px;
61-
}
62-
${from.desktop} {
63-
max-width: ${breakpoints.desktop}px;
64-
}
65-
`;
66-
6747
const leftContentChildStyles = css`
6848
display: flex;
6949
align-items: center;
@@ -79,18 +59,37 @@ const leftContentChildStyles = css`
7959
right: 0;
8060
top: 0;
8161
bottom: 0;
82-
border-right: 1px solid ${palette('--section-border')};
62+
border-right: 1px solid ${schemePalette('--section-border')};
63+
}
64+
`;
65+
66+
const detailsPositionStyles = css`
67+
/** 40px minus 1px border */
68+
top: 39px;
69+
left: 0px;
70+
71+
${from.mobile} {
72+
left: -108px;
73+
}
74+
75+
${from.mobileLandscape} {
76+
left: -128px;
77+
}
78+
79+
${from.tablet} {
80+
max-width: ${breakpoints.tablet}px;
81+
}
82+
${from.desktop} {
83+
max-width: ${breakpoints.desktop}px;
8384
}
8485
`;
8586

8687
const detailsExpandedAreaStyles = css`
8788
${textSans15};
88-
background-color: ${palette('--labs-about-dropdown-background')};
89-
border-top: 1px solid ${palette('--section-border')};
89+
background-color: ${schemePalette('--labs-about-dropdown-background')};
90+
border-top: 1px solid ${schemePalette('--section-border')};
9091
9192
width: 100vw;
92-
/* margin-left: -${grid.mobileColumnGap}; */
93-
9493
${from.tablet} {
9594
width: ${breakpoints.tablet}px;
9695
}
@@ -104,7 +103,7 @@ const detailsExpandedAreaStyles = css`
104103
105104
padding: ${space[2]}px 10px;
106105
${from.mobileLandscape} {
107-
padding: ${space[3]}px 20px;
106+
padding: ${space[3]}px ${space[5]}px;
108107
}
109108
`;
110109

@@ -152,6 +151,11 @@ export const LabsPageHeader = ({ editionId }: { editionId: EditionId }) => (
152151
priority="subdued"
153152
icon={<SvgArrowRightStraight />}
154153
href="https://www.theguardian.com/info/2016/jan/25/content-funding"
154+
theme={{
155+
textSubdued: schemePalette(
156+
'--labs-about-dropdown-link',
157+
),
158+
}}
155159
>
156160
Learn more
157161
</LinkButton>
@@ -160,7 +164,6 @@ export const LabsPageHeader = ({ editionId }: { editionId: EditionId }) => (
160164
</div>
161165
</div>
162166

163-
{/* labs logo */}
164167
<div css={logoStyles}>
165168
<Link
166169
href={`https://www.theguardian.com/guardian-labs${getLabsUrlSuffix(

0 commit comments

Comments
 (0)