Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Created Button styling + homepage formatting updates #8

Merged
merged 3 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions components/button.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import Link from "next/link";

export default function Button({ href, text }) {
return (
<Link
className="rounded-lg xl:p-4 p-3 lg:text-lg text-base hover:-translate-y-1 bg-translucent transition drop-shadow-md"
href={href}
>
{text}
</Link>
);
}
36 changes: 10 additions & 26 deletions pages/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import Wave from "@/components/wave";
import Wave180 from "@/components/wave180";
import Hero from "@/components/hero";
import Link from "next/link";
import Button from "@/components/button";

import fs from "fs";
import path from "path";
// import Markdown from 'markdown-to-jsx';
Expand All @@ -18,17 +20,19 @@ export default function Home({ sponsors, projects }) {
return (
<Layout>
<Hero>
<div className="flex gap-8 items-center md:flex-row flex-col-reverse">
<div className="flex gap-8 items-center md:flex-row flex-col-reverse p-8">
<div className="md:w-1/2 w-full">
<h1
className={`mb-2 md:mb-5 lg:text-5xl md:text-4xl text-3xl font-bold font-sans tracking-tight`}
>
<h1 className="mb-2 md:mb-5 lg:text-5xl md:text-4xl text-3xl font-bold font-sans tracking-tight">
U of M&apos;s Premier Data Science Club
</h1>
<p className="mb-10 lg:text-xl md:text-lg text-base font-light lg:tracking-wider tracking-normal">
<p className="mb-5 xl:text-xl lg:text-lg text-base font-light lg:tracking-wider tracking-normal">
We empower the next generation of data scientists at the
University of Michigan through education and exploration.
</p>
<div className="flex md:justify-start justify-center gap-5">
<Button href="/join" text="Join Us" />
<Button href="/sponsors" text="Work with Us" />
</div>
</div>
<Image
className="md:w-1/2 w-full"
Expand All @@ -42,21 +46,6 @@ export default function Home({ sponsors, projects }) {
alt="Image of a dataframe"
/>
</div>

<div className="flex justify-center gap-5">
<Link
className="border-2 rounded-full p-3 hover:-translate-y-1"
href="/join"
>
Join Us
</Link>
<Link
className="border-2 rounded-full p-3 hover:-translate-y-1"
href="/sponsors"
>
Work With Us
</Link>
</div>
</Hero>
<div className="container mx-auto px-2">
<div className="grid bullets items-center gap-x-8 gap-y-2 grid-flow-col">
Expand Down Expand Up @@ -103,12 +92,7 @@ export default function Home({ sponsors, projects }) {
All UM Ann Arbor students can join for free!
</h2>
<div className="flex mt-4 justify-center">
<Link
className="border-2 rounded-full p-3 hover:-translate-y-1"
href=""
>
Join Us
</Link>
<Button href="/join" text="Join Us" />
</div>
</div>

Expand Down
6 changes: 3 additions & 3 deletions pages/team.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Layout from "@/components/layout";
import Hero from "@/components/hero";
import Link from "next/link";
import Image from "next/image";
import { IoLogoGithub, IoLogoLinkedin } from "react-icons/io";
import Icon from "@/components/icon";
import fs from "fs";
import path from "path";
import { useRouter } from "next/router";
Expand Down Expand Up @@ -63,14 +63,14 @@ function MemberCard({ json, basePath }) {
{json.linkedin ? (
<li>
<Link href={json.linkedin} className="hover:text-gray">
<IoLogoLinkedin className="w-6 h-6" />
<Icon name="linkedin" className="text-3xl" />
</Link>
</li>
) : null}
{json.github ? (
<li>
<Link href={json.github} className="hover:text-gray">
<IoLogoGithub className="w-6 h-6" />
<Icon name="github" className="text-3xl" />
</Link>
</li>
) : null}
Expand Down
1 change: 1 addition & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module.exports = {
},
colors: {
transparent: "transparent",
translucent: "#F3F5F744",
current: "currentColor",
black: colors.black,
white: colors.white,
Expand Down