Skip to content

Commit f053f81

Browse files
committed
feat: replaced <a /> with <Link />, used tailwind config colour schemes, added padding to images
2 parents dd85a64 + ef5abe0 commit f053f81

File tree

8 files changed

+105
-85
lines changed

8 files changed

+105
-85
lines changed

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"prepare": "husky install"
1414
},
1515
"dependencies": {
16+
"@fontsource/league-gothic": "^5.0.18",
17+
"@fontsource/poppins": "^5.0.8",
1618
"@vitejs/plugin-react": "^4.2.1",
1719
"prop-types": "^15.8.1",
1820
"react": "^18.2.0",

src/assets/styles/index.css

Lines changed: 16 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,24 @@
11
@import "tailwindcss/base";
22
@import "tailwindcss/components";
33
@import "tailwindcss/utilities";
4+
@import "@fontsource/poppins/400.css";
5+
@import "@fontsource/poppins/900.css";
6+
@import "@fontsource/league-gothic";
47

58
/* Reset default browser styles */
6-
html,
7-
body,
8-
h1,
9-
h2,
10-
h3,
11-
h4,
12-
h5,
13-
h6,
14-
p,
15-
blockquote,
16-
pre,
17-
a,
18-
abbr,
19-
address,
20-
cite,
21-
code,
22-
del,
23-
dfn,
24-
em,
25-
img,
26-
ins,
27-
kbd,
28-
q,
29-
samp,
30-
small,
31-
strong,
32-
sub,
33-
sup,
34-
var,
35-
b,
36-
i,
37-
dl,
38-
dt,
39-
dd,
40-
ol,
41-
ul,
42-
li,
43-
fieldset,
44-
form,
45-
label,
46-
legend,
47-
table,
48-
caption,
49-
tbody,
50-
tfoot,
51-
thead,
52-
tr,
53-
th,
54-
td,
55-
article,
56-
aside,
57-
figure,
58-
footer,
59-
header,
60-
hgroup,
61-
menu,
62-
nav,
63-
section,
64-
time,
65-
mark,
66-
audio,
67-
video {
9+
* {
6810
margin: 0;
6911
padding: 0;
70-
border: 0;
71-
font-size: 100%;
72-
font: inherit;
73-
vertical-align: baseline;
12+
box-sizing: border-box;
13+
font-family: "poppins", "sans-serif";
14+
}
15+
16+
a {
17+
text-decoration: none;
18+
color: inherit;
19+
}
20+
21+
.text-outlined {
22+
-webkit-text-stroke-width: 2px;
23+
-webkit-text-stroke-color: #737373;
7424
}

src/components/Heading/index.jsx

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import PropTypes from "prop-types";
2+
3+
function Heading({ text }) {
4+
return (
5+
<div className="relative text-center font-black uppercase tracking-tighter -m-2">
6+
<div className="xs:text-4xl sm:text-6xl lg:text-8xl text-outlined text-transparent leading-[145%]">
7+
{text}
8+
</div>
9+
<div className="xs:text-2xl sm:text-4xl lg:text-6xl text-text-light absolute w-full leading-none bottom-[-20%]">
10+
{text}
11+
</div>
12+
</div>
13+
);
14+
}
15+
16+
Heading.propTypes = {
17+
text: PropTypes.string.isRequired,
18+
};
19+
20+
export default Heading;

src/components/SkewButton.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function SkewButton({ text, link }) {
77
<Link to={link}>
88
<button
99
type="button"
10-
className="transform hover:-translate-y-1 transition motion-reduce:transition-none motion-reduce:hover:transform-none bg-white text-background font-sans font-extrabold px-4 py-2 -skew-x-12"
10+
className="transform hover:-translate-y-1 transition motion-reduce:transition-none motion-reduce:hover:transform-none bg-background-light text-text-dark font-poppins font-extrabold px-4 py-2 -skew-x-12"
1111
>
1212
{text}
1313
</button>

src/pages/Home/index.jsx

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
1+
import Heading from "@/components/Heading";
2+
13
function Home() {
2-
return <div>Home</div>;
4+
return (
5+
<>
6+
<div className="bg-background-dark h-screen flex">
7+
<div className="m-auto">
8+
<div className="text-7xl md:text-9xl lg:text-[11rem] text-primary text-center font-gothic uppercase">
9+
Codex, SIT
10+
</div>
11+
<div className="text-lg md:text-2xl lg:text-3xl mt-4 text-text-light text-center">
12+
Coding Club
13+
</div>
14+
</div>
15+
</div>
16+
<Heading text="What do we do?" />
17+
</>
18+
);
319
}
420

521
export default Home;

src/pages/Teams/TeamMember.jsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ function TeamMember({ member }) {
99
member;
1010

1111
return (
12-
<div className="transition ease-in-out delay-150 hover:-translate-y-1 hover:scale-110 duration-300 cursor-pointer bg-zinc-700 rounded-3xl shadow-2xl shadow-background overflow-hidden p-2 space-y-4 align-middle aspect-ratio aspect-ratio-1/1">
13-
<div className="border-8xl border-4 bg-zinc-700 rounded-3xl overflow-hidden p-3 space-y-4 align-middle aspect-ratio aspect-ratio-1/1">
12+
<div className="transition ease-in-out delay-150 hover:-translate-y-1 hover:scale-110 duration-300 hover:drop-shadow-2xl drop-shadow-background cursor-pointer bg-gradient-to-br from-gradient-light to-gradient-dark rounded-3xl shadow-2xl shadow-background overflow-hidden p-2 space-y-4 align-middle aspect-ratio aspect-ratio-1/1">
13+
<div className="border-8xl border-4 border-secondary-light bg-gradient-to-br from-gradient-light to-gradient-dark rounded-3xl overflow-hidden p-3 space-y-4 align-middle aspect-ratio aspect-ratio-1/1">
1414
<img
1515
src={image}
1616
alt={name}
17-
className="w-40 h-40 rounded-full mx-auto"
17+
className="w-40 h-40 p-2 rounded-full mx-auto"
1818
/>
19-
<h2 className="text-3xl font-sans font-semi-bold text-center text-white">
19+
<h2 className="text-3xl font-poppins font-semi-bold text-center text-text-light">
2020
{name}
2121
</h2>
22-
<p className="text-l font-sans text-center font-bold text-white">
22+
<p className="text-l font-poppins text-center font-bold text-text-light">
2323
{position}
2424
</p>
25-
<p className="font-sans text-center text-wrap text-white">
25+
<p className="font-poppins text-center text-wrap text-text-light">
2626
{description}
2727
</p>
2828
<div className="flex justify-center space-x-4">
@@ -68,4 +68,4 @@ TeamMember.propTypes = {
6868
}).isRequired,
6969
};
7070

71-
export default TeamMember;
71+
export default TeamMember;

src/pages/Teams/index.jsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import TeamMember from "@/pages/Teams/TeamMember";
22
import SkewButton from "@/components/SkewButton";
3+
import Heading from "@/components/Heading/index"
34
import teamMembersData from "./teamsdata.json";
45

56
function Teams() {
@@ -8,15 +9,18 @@ function Teams() {
89
));
910

1011
return (
11-
<div className="bg-zinc-800 min-h-screen">
12-
<div className="flex-grow container mx-auto pr-20 pl-20 space-x-30 py-8">
13-
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-8 grid grid-rows-auto">
14-
{teamMembers}
12+
<div className="bg-background-dark min-h-screen">
13+
<div className="flex justify-center items-center">
14+
<div className="flex-grow container mx-auto pr-20 pl-20 space-x-30 py-8">
15+
<Heading text = "MEET OUR TEAM" className="text-center absolute top-0 left-0 right-0 mb-24" />
16+
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-8 grid grid-rows-auto mt-12">
17+
{teamMembers}
18+
</div>
19+
<SkewButton text="SEE ALL" link="/all-members" className="mt-16" />
1520
</div>
16-
<SkewButton text="SEE ALL" link="/all-members" />
1721
</div>
1822
</div>
1923
);
2024
}
2125

22-
export default Teams;
26+
export default Teams;

tailwind.config.js

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,40 @@ export default {
44
theme: {
55
extend: {
66
colors: {
7-
background: '#232323',
8-
primary: '#F24E3F',
9-
text: '#F7F7F7',
7+
primary: {
8+
DEFAULT: "#E76941",
9+
light: "#FFA06D",
10+
dark: "#B54B1E",
11+
contrastText: "#F7F7F7",
12+
},
13+
secondary: {
14+
DEFAULT: "#737373",
15+
light: "#A3A3A3",
16+
dark: "#222222",
17+
},
18+
background: {
19+
dark: "#232323",
20+
light: "#F7F7F7",
21+
},
22+
text: {
23+
light: "#F7F7F7",
24+
dark: "#232323",
25+
},
26+
gradient: {
27+
light: "#383838",
28+
dark: "#222222 ",
29+
}
30+
},
31+
screens: {
32+
xs: "0px",
33+
sm: "600px",
34+
md: "768px",
35+
lg: "1024px",
36+
xl: "1280px",
1037
},
1138
fontFamily: {
12-
sans: ['Roboto', 'sans-serif'],
39+
poppins: ["Poppins", "sans-serif"],
40+
gothic: ["League Gothic", "sans-serif"]
1341
},
1442
},
1543
},

0 commit comments

Comments
 (0)