Skip to content

Commit 6f27b98

Browse files
Merge pull request #60 from oslabs-beta/kyler/siteTeam
feat: Made text, buttons, and images adjust with screen size
2 parents 64e16ee + 4312059 commit 6f27b98

File tree

6 files changed

+47
-26
lines changed

6 files changed

+47
-26
lines changed

mlflow-site/src/app/components/Headline.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const Headline = () => {
44
return (
55
<div className='home' id='headline'>
66
<div className='bigHeadline'>MLOps workflow for Javascript</div>
7-
<div>Harness MLflow&apos;s MLOps functionality for your Javascript application with MLflow.js</div>
7+
<div className='headLineText'>Harness MLflow&apos;s MLOps functionality for your Javascript application with MLflow.js</div>
88
<Button />
99
</div>
1010
);

mlflow-site/src/app/components/NavBar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const NavBar = () => {
4545
href='https://github.com/oslabs-beta/mlflow-js'
4646
className='navBarLinksGithub'
4747
>
48-
<Image src={'/assets/GithubLogo.png'} width={24} height={24} alt='G' />
48+
<Image src={'/assets/GithubLogo.png'} width={24} height={24} alt='G' className='navbarGithub'/>
4949
</a>
5050
</div>
5151
</div>

mlflow-site/src/app/components/Team.tsx

+6-7
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ const Team = () => {
2626
linkedIn: 'https://www.linkedin.com/in/stephanyho/',
2727
pfp: '',
2828
},
29+
{
30+
name: 'Winston Ludlam',
31+
github: 'https://github.com/winjolu/',
32+
linkedIn: 'https://www.linkedin.com/in/wjludlam/',
33+
pfp: '',
34+
},
2935
];
3036

3137
return (
@@ -42,13 +48,6 @@ const Team = () => {
4248
/>
4349
))}
4450
</div>
45-
<TeamCard
46-
key={'soloCard'}
47-
name={'Winston Ludlam'}
48-
github={'https://github.com/winjolu/'}
49-
linkedIn={'https://www.linkedin.com/in/wjludlam/'}
50-
pfp={''}
51-
/>
5251
</div>
5352
);
5453
};

mlflow-site/src/app/components/TeamCard.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ interface TeamCardProps {
1010
const TeamCard: React.FC<TeamCardProps> = ({ name, github, linkedIn, pfp }) => {
1111
return (
1212
<div className='teamcard'>
13-
<Image src={pfp} width={70} height={70} alt='No Image' />
13+
<Image src={pfp} width={80} height={80} alt='No Image' className='teamCardImg'/>
1414
<div>{name}</div>
1515
<div className='teamcardLinks'>
1616
<a href={github} className='teamCardLink1'>
17-
<Image
17+
<Image className='navbarGithub'
1818
src={'/assets/GithubLogo.png'}
1919
width={20}
2020
height={20}
2121
alt='G'
2222
/>
2323
</a>
2424
<a href={linkedIn} className='teamCardLink2'>
25-
<Image
25+
<Image className='navbarGithub'
2626
src={'/assets/LinkedInLogo.png'}
2727
width={20}
2828
height={20}

mlflow-site/src/app/globals.css

+28-14
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ body {
3030
width: 100%;
3131
height: 100%;
3232
display: grid;
33-
grid-template-columns: 1fr 360px 1fr;
33+
grid-template-columns: 1fr 100vw 1fr;
3434
grid-template-rows: 1fr;
3535
overflow-y: auto;
3636
}
@@ -74,6 +74,7 @@ body {
7474
display: grid;
7575
grid-template-columns: auto auto;
7676
grid-template-rows: 100%;
77+
font-size: clamp(1rem, 4.43vw, 1.2rem);
7778
}
7879

7980
.navBarLinks {
@@ -103,19 +104,27 @@ body {
103104
grid-column: 5;
104105
}
105106

107+
.navbarGithub {
108+
width: clamp(1.5rem, 6.645vw, 1.8rem);
109+
}
110+
106111
.navBarMlflow {
107112
color: rgb(66, 107, 31);
108-
font-size: 1.2rem;
113+
font-size: clamp(1.2rem, 5.316vw, 1.9rem);
109114
font-family: Newsreader;
110115
display: flex;
111116
align-items: center;
112117
}
113118

114119
.bigHeadline {
115-
font-size: 1.7rem;
120+
font-size: clamp(1.7rem, 6.531vw, 3rem);
116121
font-family: Newsreader;
117122
}
118123

124+
.headLineText {
125+
font-size: clamp(1rem, 4.43vw, 1.76rem);
126+
}
127+
119128
.mobileInnerWrapper {
120129
grid-column: 3;
121130
grid-row: 3;
@@ -142,11 +151,11 @@ body {
142151
}
143152

144153
.homeButton {
145-
padding: 3px;
146-
padding-left: 6px;
147-
padding-right: 6px;
148-
border-radius: 5px;
149-
font-size: 0.8rem;
154+
padding: clamp(0.1875rem, 0.830625vw, 0.328125rem);
155+
padding-left: clamp(0.375rem, 1.66125vw, .65625rem);
156+
padding-right: clamp(0.375rem, 1.66125vw, .65625rem);
157+
border-radius: clamp(0.3125rem, 1.384375vw, 0.546875rem);
158+
font-size: clamp(0.8rem, 3.544vw, 1.05rem);
150159
margin-right: 8px;
151160
}
152161

@@ -198,14 +207,14 @@ body {
198207
}
199208

200209
.teamHead {
201-
font-size: 1.35rem;
210+
font-size: clamp(1.35rem, 5.9805vw, 2.376rem);
202211
}
203212

204213
.teamCards {
205214
width: 100%;
206-
display: grid;
207-
grid-template-columns: 50% 50%;
208-
grid-template-rows: repeat(calc(100%/3), 3);
215+
display: flex;
216+
justify-content: space-evenly;
217+
flex-wrap: wrap;
209218
}
210219

211220
.teamcard {
@@ -214,11 +223,16 @@ body {
214223
flex-direction: column;
215224
justify-content: center;
216225
align-items: center;
226+
font-size: clamp(1rem, 4.43vw, 1.3rem);
227+
padding: clamp(.22rem, 1.1927vw,0.35rem);
228+
margin-left: 0.2rem;
229+
margin-right: 0.2rem;
230+
background-color: rgb(217, 225, 210);
217231
}
218232

219233
.teamCardImg {
220-
width: 50px;
221-
height: 50px;
234+
width: clamp(80px, 22.155vw, 100px);
235+
border: 1px solid black;
222236
}
223237

224238
.teamcardLinks {

mlflow-site/src/app/layout.tsx

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { Metadata } from "next";
22
import localFont from "next/font/local";
33
import "./globals.css";
4+
import { Viewport } from "next";
45

56
const geistSans = localFont({
67
src: "./fonts/GeistVF.woff",
@@ -18,6 +19,13 @@ export const metadata: Metadata = {
1819
description: "Generated by create next app",
1920
};
2021

22+
export const viewport: Viewport = {
23+
themeColor: "#000000",
24+
initialScale: 1,
25+
width: "device-width",
26+
maximumScale: 1,
27+
};
28+
2129
export default function RootLayout({
2230
children,
2331
}: Readonly<{

0 commit comments

Comments
 (0)