Skip to content

Commit

Permalink
Merge branch 'master' into fix_alignment_issues
Browse files Browse the repository at this point in the history
  • Loading branch information
HaudinFlorence committed Sep 3, 2024
2 parents 4d346cd + 105659d commit 13de92c
Show file tree
Hide file tree
Showing 12 changed files with 70 additions and 8 deletions.
1 change: 0 additions & 1 deletion src/components/about/SmallPortraitCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import SocialMediaContacts from "./SocialMediaContacts";
import { useRef, useState } from "react";
import LargePortraitCard from "./LargePortraitCard";
import Avatar from "./Avatar";
import Link from "@docusaurus/Link";

const contentStyle = {
background: "white",
Expand Down
1 change: 0 additions & 1 deletion src/components/about/SubTeam.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export default function SubTeam({
<div className="col">
<PopupPortrait
person={person}

/>
</div>
</li>
Expand Down
7 changes: 7 additions & 0 deletions src/components/about/Team/Arjun.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Arjun is a Scientific Software Development Intern at QuantStack.

He is currently a final-year student at the University of Delhi, India, pursuing his Bachelors of Technology degree with a major in Information Technology.

He is very passionate about open source & open science. In the past he has been a contributor, maintainer & mentor at <a target="_blank" href="https://pybamm.org/">PyBaMM</a> & other open-source projects. Additionally he has also been a Software Developer at Development Monitors LLC, Arlington VA where he had been involved in the core development of some World Bank funded GIS projects.

His plan is to remain consistently involved in the open source community long-term, adding value in every way possible.
5 changes: 5 additions & 0 deletions src/components/about/Team/Matthias.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Matthias is Director of Business Development at QuantStack.

He began his career studying Physics and Geophysics developing a passion for numerical computing and open-source software. After his PhD and a PostDoc, Matthias committed fully to professional software development and worked with many of the world’s leading IT companies. Accumulating over 15 years of experience in both academic and industry settings, he has developed software for a wide range of projects, from personal initiatives to startup products and large enterprise systems, and has successfully led teams in building and delivering complex solutions.

In addition to with a strong background in purely functional programming. He is an active contributor to several popular open-source projects and has also organized community events.
40 changes: 39 additions & 1 deletion src/components/about/Team/team.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import AndreasMD from "@site/src/components/about/Team/Andreas.md";
import AndreasAvatarUrl from "@site/static/img/avatars/Andreas.png";
import AnutoshMD from "@site/src/components/about/Team/Anutosh.md";
import AnutoshAvatarUrl from "@site/static/img/avatars/Anutosh.png";
import ArjunMD from "@site/src/components/about/Team/Arjun.md"
import ArjunAvatarUrl from "@site/static/img/avatars/Arjun.png";
import DavidMD from "@site/src/components/about/Team/David.md";
import DavidAvatarUrl from "@site/static/img/avatars/David.png";
import DarianMD from "@site/src/components/about/Team/Darian.md";
Expand Down Expand Up @@ -36,6 +38,8 @@ import KerimMD from "@site/src/components/about/Team/Kerim.md";
import KerimAvatarUrl from "@site/static/img/avatars/Kerim.png";
import MartinMD from "@site/src/components/about/Team/Martin.md";
import MartinAvatarUrl from "@site/static/img/avatars/Martin.png";
import MatthiasMD from "@site/src/components/about/Team/Matthias.md";
import MatthiasAvatarUrl from "@site/static/img/avatars/Matthias.png";
import MeriemMD from "@site/src/components/about/Team/Meriem.md";
import MeriemAvatarUrl from "@site/static/img/avatars/Meriem.png";
import NicolasMD from "@site/src/components/about/Team/Nicolas.md";
Expand Down Expand Up @@ -379,6 +383,24 @@ export const coreTeam = [
subTeamName: "coreTeam",
BioComponent: KerimMD,
},
{
completeName: "Arjun Verma",
firstName: "Arjun",
position: " Scientific Software Development Intern",
onLinkednIn: "true",
onGithub: "true",
onX: "true",
githubLink: "https://github.com/arjxn-py",
LinkedInLink:
"https://www.linkedin.com/in/arjun-verma-758608226/",
XLink: "https://x.com/ArjxnPy",
githubName: "@arjxn-py",
avatarUrl: ArjunAvatarUrl,
distinctionTitle: [],
distinctionLink: [],
subTeamName: "coreTeam",
BioComponent: ArjunMD,
},
];

export const QSCollaboratorsTeam = [
Expand Down Expand Up @@ -522,4 +544,20 @@ export const leadershipTeam = [
subTeamName: "LeadershipTeam",
BioComponent: DavidMD,
},
];
{
completeName: "Matthias Meschede",
firstName: "Matthias",
position: "Director Business Development",
onGithub: "true",
onLinkedIn: "true",
onX: false,
githubLink: "https://github.com/mmesch",
LinkedInLink: "https://www.linkedin.com/in/mmesch/",
githubName: "@mmesch",
avatarUrl: MatthiasAvatarUrl,
distinctionTitle: [],
distinctionLink: [],
subTeamName: "LeadershipTeam",
BioComponent: MatthiasMD,
},
];
4 changes: 3 additions & 1 deletion src/components/about/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
color: var(--ifm-color-primary-p2);
border-radius: 8px;
box-shadow: 0px 0px 8px 1px #c8c8c7;
padding: var(--ifm-spacing-lg) var(--ifm-spacing-md);
padding: var(--ifm-spacing-lg) var(--ifm-spacing-xs);
margin-bottom: var(--ifm-spacing-xl);
}

Expand All @@ -15,6 +15,7 @@
text-decoration: #0000EE underline;
}


.value_text p {
font-family: var(--ifm-font-family-roboto);
font-size: 14px;
Expand Down Expand Up @@ -50,6 +51,7 @@ div .row {
line-height: 24px;
letter-spacing: 0.15px;
margin: var(--ifm-spacing-xs) 0;
width: 100%
}

.small_card_position {
Expand Down
15 changes: 14 additions & 1 deletion src/components/blog/blogpostsDetails.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
[
{
"url": "https://blog.jupyter.org/ipydatagrid-is-now-part-of-project-jupyter-3b3dfb877664",
"title": "Ipydatagrid is now part of Project Jupyter",
"image": "/img/blogposts/Ipydatagrid-is-now-part-of-ProjectJupyter.png",
"summary": "Today, we are proud to announce that the ipydatagrid open source project has been incorporated into Project Jupyter as part of the Jupyter Widgets subproject.",
"date": "August 22, 2024",
"authors": "Sylvain Corlay, on behalf of the Jupyter Widgets Council",
"imageID": "blogpost-image-120",
"imageNaturalWidth": 1490,
"imageNaturalHeight": 760,
"imageRenderedWidth": 273,
"imageRenderedHeight": 138.2281879194631
},
{
"url": "https://medium.com/@QuantStack/introducing-mamba-2-0-0e8d5c6d1d0c",
"title": "Introducing Mamba 2.0",
Expand Down Expand Up @@ -1546,4 +1559,4 @@
"imageRenderedWidth": 180,
"imageRenderedHeight": 180
}
]
]
4 changes: 1 addition & 3 deletions src/components/projects/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ div .project_title {
}

.project_description {
padding: var(--ifm-spacing-md) var(--ifm-spacing-xl);
text-align: center;
}

Expand Down Expand Up @@ -46,7 +45,7 @@ div .project_title {
letter-spacing: 0.25px;
text-align: center;
margin-bottom: var(--ifm-spacing-lg);
padding: var(--ifm-spacing-lg) var(--ifm-spacing-2xl);
padding: var(--ifm-spacing-lg) var(--ifm-spacing-xl);
}

.col_project_text p {
Expand Down Expand Up @@ -84,7 +83,6 @@ div .project_title {
/*Desktop*/
.header_container {
margin-top: var(--ifm-spacing-6xl);
background-color: red;
}
.header_title {
padding-left: var(--ifm-spacing-4xl);
Expand Down
1 change: 1 addition & 0 deletions src/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ ul {
line-height: 20px;
letter-spacing: 0.25px;
text-align: center;
padding: var(--ifm-spacing-lg)
}

li {
Expand Down
Binary file added static/img/avatars/Arjun.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/avatars/Matthias.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 13de92c

Please sign in to comment.