Skip to content

Commit a355572

Browse files
authored
Merge pull request #73 from galaxyproject/fran/72-brc-theme
fix: fix brc theme and page styles (#72)
2 parents 04c7f94 + ad5c909 commit a355572

File tree

39 files changed

+259
-249
lines changed

39 files changed

+259
-249
lines changed

app/components/About/components/Section/components/SectionAbout/sectionAbout.styles.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
import styled from "@emotion/styled";
2-
import { SectionLayout } from "../../section.styles";
2+
import {
3+
sectionGrid,
4+
sectionLayout,
5+
} from "../../../../../Layout/components/AppLayout/components/Section/section.styles";
36

4-
export const StyledSectionLayout = styled(SectionLayout)`
7+
export const SectionLayout = styled.div`
8+
${sectionLayout};
9+
${sectionGrid};
510
grid-template-columns: 1fr;
611
padding: 98px 16px;
712
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { AboutContent } from "../../../../content";
22
import { Section } from "../../section.styles";
3-
import { StyledSectionLayout } from "./sectionAbout.styles";
3+
import { SectionLayout } from "./sectionAbout.styles";
44

55
export const SectionAbout = (): JSX.Element => {
66
return (
77
<Section>
8-
<StyledSectionLayout>
8+
<SectionLayout>
99
<AboutContent />
10-
</StyledSectionLayout>
10+
</SectionLayout>
1111
</Section>
1212
);
1313
};
Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,6 @@
1-
import { mediaTabletUp } from "@databiosphere/findable-ui/lib/styles/common/mixins/breakpoints";
2-
import { white } from "@databiosphere/findable-ui/lib/styles/common/mixins/colors";
31
import styled from "@emotion/styled";
4-
import {
5-
sectionGrid,
6-
SectionLayout as DefaultLayout,
7-
} from "../../../Layout/components/AppLayout/components/Section/section.styles";
2+
import { sectionSubHero } from "../../../Layout/components/AppLayout/components/Section/section.styles";
83

94
export const Section = styled.section`
10-
background-color: ${white};
11-
position: relative;
12-
width: 100%;
13-
z-index: 1;
14-
`;
15-
16-
export const SectionLayout = styled(DefaultLayout)`
17-
${sectionGrid};
18-
`;
19-
20-
export const SubHeadline = styled.div`
21-
display: flex;
22-
flex-direction: column;
23-
gap: 8px;
24-
grid-column: 1 / -1;
25-
26-
${mediaTabletUp} {
27-
grid-column: 1 / 6;
28-
}
29-
`;
30-
31-
export const Subhead = styled.h2`
32-
font-size: 40px;
33-
font-weight: 500;
34-
grid-column: 1 / -1;
35-
letter-spacing: -0.4px;
36-
line-height: 48px;
37-
margin: 0;
38-
`;
39-
40-
export const SectionContent = styled.div`
41-
grid-column: 1 / -1;
42-
43-
${mediaTabletUp} {
44-
grid-column: 7 / -1;
45-
}
5+
${sectionSubHero};
466
`;

app/components/Home/components/Section/components/SectionAnalytics/components/AnalyticsTools/analyticsTools.styles.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ export const StyledCardActions = styled.div`
5555
.MuiLink-root {
5656
${textBody500};
5757
color: #035c94;
58+
text-decoration: none;
59+
60+
&:hover {
61+
text-decoration: underline;
62+
}
5863
}
5964
`;
6065

app/components/Home/components/Section/components/SectionAnalytics/sectionAnalytics.styles.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
smokeMain,
44
} from "@databiosphere/findable-ui/lib/styles/common/mixins/colors";
55
import styled from "@emotion/styled";
6-
import { SectionLayout as DefaultLayout } from "../../../../../Layout/components/AppLayout/components/Section/section.styles";
6+
import { sectionLayout } from "../../../../../Layout/components/AppLayout/components/Section/section.styles";
77
import { SectionHeadline } from "../../section.styles";
88

99
export const Section = styled.section`
@@ -13,7 +13,8 @@ export const Section = styled.section`
1313
width: 100%;
1414
`;
1515

16-
export const SectionLayout = styled(DefaultLayout)`
16+
export const SectionLayout = styled.div`
17+
${sectionLayout};
1718
display: flex;
1819
flex-direction: column;
1920
gap: 48px 16px;

app/components/Home/components/Section/components/SectionBranding/sectionBranding.styles.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.

app/components/Home/components/Section/components/SectionBranding/sectionBranding.tsx

Lines changed: 0 additions & 10 deletions
This file was deleted.

app/components/Home/components/Section/components/SectionHelp/components/Questions/questions.styles.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { elevation01 } from "@databiosphere/findable-ui/lib/theme/common/shadows
88
import styled from "@emotion/styled";
99
import { Accordion as MAccordion } from "@mui/material";
1010
import { sectionGrid } from "../../../../../../../Layout/components/AppLayout/components/Section/section.styles";
11+
import { muiLink } from "../../../../section.styles";
1112

1213
export const Grid = styled.div`
1314
${sectionGrid};
@@ -21,6 +22,7 @@ export const Grid = styled.div`
2122
`;
2223

2324
export const StyledAccordion = styled(MAccordion)`
25+
${muiLink};
2426
box-shadow: ${elevation01} !important;
2527
display: grid;
2628
grid-column: 1 / -1;
@@ -42,14 +44,5 @@ export const StyledAccordion = styled(MAccordion)`
4244
color: ${inkLight};
4345
margin: 0;
4446
padding: 0 20px 8px;
45-
46-
.MuiLink-root {
47-
color: #28285b;
48-
text-decoration: underline;
49-
50-
&:hover {
51-
text-decoration: none;
52-
}
53-
}
5447
}
5548
` as typeof MAccordion;

app/components/Home/components/Section/components/SectionHelp/sectionHelp.styles.ts

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import {
66
import styled from "@emotion/styled";
77
import {
88
sectionGrid,
9-
SectionLayout as DefaultLayout,
9+
sectionLayout,
1010
} from "../../../../../Layout/components/AppLayout/components/Section/section.styles";
1111
import {
12+
muiLink,
1213
SectionHeadline,
1314
SectionSubtitle,
1415
SectionTitle,
@@ -20,7 +21,8 @@ export const Section = styled.section`
2021
width: 100%;
2122
`;
2223

23-
export const SectionLayout = styled(DefaultLayout)`
24+
export const SectionLayout = styled.div`
25+
${sectionLayout};
2426
${sectionGrid};
2527
padding: 85px 16px 150px;
2628
`;
@@ -41,14 +43,6 @@ export const StyledSectionTitle = styled(SectionTitle)`
4143
`;
4244

4345
export const StyledSectionSubTitle = styled(SectionSubtitle)`
46+
${muiLink};
4447
line-height: 28px;
45-
46-
.MuiLink-root {
47-
color: #28285b;
48-
text-decoration: underline;
49-
50-
&:hover {
51-
text-decoration: none;
52-
}
53-
}
5448
`;
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import styled from "@emotion/styled";
2+
3+
export const SVG = styled.svg`
4+
position: absolute;
5+
z-index: -1;
6+
`;

0 commit comments

Comments
 (0)