Skip to content

Commit 4397a33

Browse files
HaudinFlorenceSylvainCorlay
HaudinFlorence
authored and
SylvainCorlay
committed
Address style issue comments made on the PR.
1 parent 0f901b4 commit 4397a33

File tree

10 files changed

+89
-84
lines changed

10 files changed

+89
-84
lines changed

‎src/components/about/SmallPortraitCard.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import SocialMediaContacts from "./SocialMediaContacts";
44
import { useRef, useState } from "react";
55
import LargePortraitCard from "./LargePortraitCard";
66
import Avatar from "./Avatar";
7+
import Link from "@docusaurus/Link";
78

89
const contentStyle = {
910
background: "white",

‎src/components/about/styles.module.css‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,22 @@ div .row {
3636
}
3737

3838
.small_card_complete_name {
39-
font-size: 16px;
39+
font-size: 24px;
4040
font-family: var(--ifm-font-family-roboto);
4141
color: var(--ifm-color-primary-p2);
4242
font-style: normal;
43-
font-weight: 500;
43+
font-weight: 400;
4444
line-height: 24px;
4545
letter-spacing: 0.15px;
4646
margin: var(--ifm-spacing-xs) 0;
4747
}
4848

4949
.small_card_position {
50-
font-size: var(--ifm--font-size-normal);
50+
font-size: 16px;
5151
font-family: var(--ifm-font-family-roboto);
5252
color: var(---ifm-text-color);
5353
font-style: normal;
54-
font-weight: 600;
54+
font-weight: 400;
5555
line-height: 24px;
5656
letter-spacing: 0.5px;
5757
color: var(--ifm-color-primary-p2);
@@ -96,7 +96,7 @@ div .large_card_position {
9696
}
9797

9898
.githubname {
99-
font-size: var(--ifm-font-size-normal);
99+
font-size: 16px;
100100
font-family: var(--ifm-font-family-roboto);
101101
font-style: normal;
102102
font-weight: 400;

‎src/components/careers/styles.module.css‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,21 @@
5656
color: var(--ifm-text-color);
5757
text-align: center;
5858
font-family: var(--ifm-font-family-roboto);
59-
font-size: 28px;
59+
font-size: 22px;
6060
font-style: normal;
6161
font-weight: 400;
62-
line-height: 36px; /* 128.571% */
62+
line-height: 128.571%;
63+
margin-top: var(--ifm-spacing-lg);
6364
}
6465

6566
.interview_position {
6667
color: var(--ifm-text-color);
6768
text-align: center;
6869
font-family: var(--ifm-font-family-roboto);
69-
font-size: var(--ifm-font-size-normal);
70+
font-size: 16px;
7071
font-style: normal;
7172
font-weight: 400;
72-
line-height: 24px; /* 133.333% */
73+
line-height: 133.333%;
7374
letter-spacing: 0.5px;
7475
}
7576

‎src/components/projects/AllProjects.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ export default function AllProjects() {
66
return (
77
<div className="container flex-full-centered" style={{marginBottom: "var(--ifm-spacing-3xl)"}}>
88
<ul className="row">
9-
{projectsDetails.map((project, index) => (
9+
{projectsDetails.map((project, index) => {
10+
return(
1011
<li className="cards-list" key={index}>
1112
<div className="col">
12-
<ProjectCard project={project} />
13+
<ProjectCard project={project}/>
1314
</div>
1415
</li>
15-
))}
16+
)
17+
})}
1618
</ul>
1719
</div>
18-
);
20+
)
1921
}

‎src/components/projects/ProjectCard.tsx‎

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import styles from "./styles.module.css";
22

33
export default function ProjectCard({ project }): JSX.Element {
4-
/*if (project.reverse === "false") {*/
4+
const prefix = "project_picture_";
5+
const base = `${prefix}${project.name}`
56
return (
67
<div className="container">
78
<div className="row row--no-gutters horizontally-centered">
89
<div
9-
className={"col col--6 col" + " " + styles.col_project_text}
10+
className={"col col--6 col" + " " + styles.project_text}
1011
>
1112
<div className={styles.project_title}>{project.title}</div>
1213
<div className={styles.project_description}>
@@ -17,9 +18,8 @@ export default function ProjectCard({ project }): JSX.Element {
1718
className={
1819
"col col--4 flex-full-centered padding-none" +
1920
" " +
20-
styles.col_project_picture_right
21+
styles[base]
2122
}
22-
style={{ border: project.pictureBorder }}
2323
>
2424
<div className={styles.col_project_picture}></div>
2525
<img
@@ -32,36 +32,4 @@ export default function ProjectCard({ project }): JSX.Element {
3232
</div>
3333
</div>
3434
);
35-
/* } else if (project.reverse === "true") {
36-
return (
37-
<div className="container">
38-
<div className={"row horizontally-centered"}>
39-
<div
40-
className={
41-
"col col--4 flex-full-centered padding-none" +
42-
" " +
43-
styles.col_project_picture_left
44-
}
45-
style={{ border: project.pictureBorder }}
46-
>
47-
<div className={styles.col_project_picture}>
48-
<img
49-
src={project.pictureRoute}
50-
width={project.pictureWidth}
51-
height={project.pictureHeight}
52-
alt={project.pictureAltText}
53-
/>
54-
</div>
55-
</div>
56-
57-
<div className={"col col--6" + " " + styles.col_project_text}>
58-
<div className={styles.project_title}>{project.title}</div>
59-
<div className={styles.project_description}>
60-
<project.projectMD />
61-
</div>
62-
</div>
63-
</div>
64-
</div>
65-
);
66-
}*/
6735
}

‎src/components/projects/descriptions/projectsDetails.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export const projectsDetails = [
1515
pictureRoute: jupyterLogoUrl,
1616
pictureWidth: "198px",
1717
pictureHeight: "234px",
18-
pictureBorder: "solid 1px var(--ifm-color-orange-jupyter)",
1918
pictureAltText: "Picture for Jupyter project showing its logo.",
2019
ProjectMD: JupyterMD,
2120
reverse: "false"
@@ -26,7 +25,6 @@ export const projectsDetails = [
2625
pictureRoute: xtensorLogoUrl,
2726
pictureWidth: "257px",
2827
pictureHeight: "257px",
29-
pictureBorder: "solid 1px var(--ifm-color-green-xtensor)",
3028
pictureAltText: "Picture for Xtensor and Xsimd showing their respective logo.",
3129
ProjectMD: XTensorXSIMDMD,
3230
reverse: "true",
@@ -37,7 +35,6 @@ export const projectsDetails = [
3735
pictureRoute: condaforgeLogoUrl,
3836
pictureWidth: "196px",
3937
pictureHeight: "180px",
40-
pictureBorder: "solid 1px var(--ifm-color-grey-condaforge)",
4138
pictureAltText: "Picture for Condaforge project showing its forge logo.",
4239
ProjectMD: CondaForgeMD,
4340
reverse:"false"
@@ -48,7 +45,6 @@ export const projectsDetails = [
4845
pictureRoute: robostackPictureUrl,
4946
pictureWidth: "189px",
5047
pictureHeight: "210px",
51-
pictureBorder: "solid 1px rgb(146, 95, 218)",
5248
pictureAltText: "Picture for robotics project showing an illustration with a robotics device.",
5349
ProjectMD: RoboticsMD,
5450
reverse:"true"

‎src/components/projects/styles.module.css‎

Lines changed: 46 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ div .schedule_container {
44

55
.project_title {
66
margin-bottom: var(--ifm-spacing-md);
7+
margin-top: var(--ifm-spacing-xl);
78
font-family: var(--ifm-font-family-bebas-neue);
89
font-size: var(--ifm-font-size-secondary-title);
910
font-style: normal;
@@ -29,10 +30,11 @@ div .project_title {
2930
@media only screen and (max-width: 996px) {
3031
/*Mobile*/
3132

32-
.header_container{
33+
.header_container {
3334
padding-top: var(--ifm-spacing-2xl);
3435
background-color: var(--ifm-color-primary-p1);
3536
}
37+
3638
.header_title {
3739
padding-left: none;
3840
}
@@ -46,20 +48,39 @@ div .project_title {
4648
line-height: 20px;
4749
letter-spacing: 0.25px;
4850
text-align: center;
49-
margin-bottom: var(--ifm-spacing-2xl);
51+
margin-bottom: var(--ifm-spacing-lg);
5052
padding: var(--ifm-spacing-lg) var(--ifm-spacing-2xl);
5153
}
5254

53-
.col_project_text {
54-
background-color: var(--ifm-color-orange-light);
55-
padding: var(--ifm-spacing-2xl) 0 var(--ifm-spacing-md) 0;
56-
border-radius: 10px;
55+
.col_project_text p {
56+
background-color: white;
57+
text-align: justify;
58+
}
59+
60+
.project_picture_jupyter {
61+
border: none;
62+
margin-bottom: var(--ifm-spacing-xl);
63+
}
64+
65+
.project_picture_xtensorxsimd {
66+
border: none;
67+
margin-bottom: var(--ifm-spacing-xl);
68+
}
69+
70+
.project_picture_condaforge {
71+
border: none;
72+
margin-bottom: var(--ifm-spacing-xl);
73+
}
74+
75+
.project_picture_robotics {
76+
border: none;
77+
margin-bottom: var(--ifm-spacing-xl);
5778
}
5879
}
5980

6081
@media only screen and (min-width: 996px) {
6182
/*Desktop*/
62-
.header_container{
83+
.header_container {
6384
margin-top: var(--ifm-spacing-6xl);
6485
}
6586
.header_title {
@@ -72,7 +93,7 @@ div .project_title {
7293
font-size: 22px;
7394
font-style: normal;
7495
font-weight: 400;
75-
line-height: 28px;
96+
line-height: 28px;
7697
margin-bottom: var(--ifm-spacing-3xl);
7798
padding: var(--ifm-spacing-lg) var(--ifm-spacing-4xl);
7899
}
@@ -81,22 +102,34 @@ div .project_title {
81102
text-align: center;
82103
}
83104

84-
.col_project_text {
105+
.project_text {
85106
background-color: var(--ifm-color-orange-light);
86107
padding: var(--ifm-spacing-4xl) var(--ifm-spacing-3xl);
87108
margin-bottom: var(--ifm-spacing-lg);
88109
border-radius: 10px;
89-
/*box-shadow: 0px 0px 8px 1px #d0cb54;*/
90110
}
91111

92-
.col_project_picture_left {
93-
margin: none;
112+
.project_picture_jupyter {
113+
border: solid 1px var(--ifm-color-orange-jupyter);
114+
margin-bottom: var(--ifm-spacing-lg);
94115
border-radius: 10px;
116+
}
117+
118+
.project_picture_xtensorxsimd {
119+
border: solid 1px var(--ifm-color-green-xtensor);
95120
margin-bottom: var(--ifm-spacing-lg);
121+
border-radius: 10px;
96122
}
97123

98-
.col_project_picture_right {
124+
.project_picture_condaforge {
125+
border: solid 1px var(--ifm-color-grey-condaforge);
126+
margin-bottom: var(--ifm-spacing-lg);
99127
border-radius: 10px;
128+
}
129+
130+
.project_picture_robotics {
131+
border: solid 1px rgb(146, 95, 218);
100132
margin-bottom: var(--ifm-spacing-lg);
133+
border-radius: 10px;
101134
}
102135
}

‎src/components/services/SpecialProjects.tsx‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,26 @@ import SpecialProjectsIllustration from "@site/static/img/illustrations/special_
33

44
export default function SpecialProjects() {
55
return (
6-
<div className="main-container-with-margins">
7-
<div className="container upper-container-with-margin-top">
8-
<div className="row">
9-
<div className="col col--4 col--offset-2">
10-
<h2>Special projects</h2>
11-
<SpecialProjectsMD />
12-
</div>
13-
<div className={"col col--5 flex-full-centered"}>
14-
<SpecialProjectsIllustration
15-
alt={
16-
"Picture showing an illustration of a group of people working together in an office."
17-
}
18-
height={"300px"}
19-
/>
6+
<>
7+
<div className="main-container-with-margins">
8+
<div className="container upper-container-with-margin-top">
9+
<div className="row">
10+
<div className="col col--4 col--offset-2">
11+
<h2>Special projects</h2>
12+
<SpecialProjectsMD />
13+
</div>
14+
<div className={"col col--5 flex-full-centered"}>
15+
<SpecialProjectsIllustration
16+
alt={
17+
"Picture showing an illustration of a group of people working together in an office."
18+
}
19+
height={"300px"}
20+
/>
21+
</div>
2022
</div>
2123
</div>
2224
</div>
23-
</div>
25+
<div className="spacing-4xl" />
26+
</>
2427
);
2528
}

‎src/components/services/styles.module.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/*Mobile*/
77
.transition {
88
font-family: var(--ifm-font-family-bebas-neue);
9-
font-size: 40px;
9+
font-size: 24px;
1010
font-style: normal;
1111
font-weight: 600;
1212
line-height: 150%;
@@ -20,7 +20,7 @@
2020
/*Desktop*/
2121
.transition {
2222
font-family: var(--ifm-font-family-bebas-neue);
23-
font-size: 40px;
23+
font-size: 32px;
2424
font-style: normal;
2525
font-weight: 600;
2626
line-height: 150%;

‎src/css/custom.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ ul {
193193
h1 {
194194
color: var(--ifm-text-color-main-title);
195195
font-family: var(--ifm-font-family-bebas-neue);
196-
font-size: 24px;
196+
font-size: 32px;
197197
font-style: normal;
198198
font-weight: 600;
199199
line-height: 150%; /* 36px */
@@ -223,6 +223,7 @@ ul {
223223

224224
li {
225225
font-size: 14px;
226+
margin-left: 24px;
226227
}
227228

228229
.blue-banner-container {

0 commit comments

Comments
 (0)