diff --git a/components/footer.jsx b/components/footer.jsx index 0fed184ddffe7bc4e6f1ce970cd27300e2567d88..5c7369069ba75c1204f49a4829b62b34f1e90bb3 100644 --- a/components/footer.jsx +++ b/components/footer.jsx @@ -1,60 +1,29 @@ -const FooterGroup = ({ children, className }) => { - return <div className={"col-span-1 " + className}>{children}</div>; -}; -const FooterLink = ({ children, href }) => { - return ( - <div className="mb-2"> - <a - className="text-blue-900 font-light hover:underline" - href={href ?? "#"} - > - {children} - </a> - </div> - ); -}; -const FooterTitle = ({ children }) => { - return ( - <div className="mb-5"> - <h3 className="text-blue-900 font-bold text-lg">{children}</h3> - </div> - ); -}; - export const Footer = () => { return ( - <div className="grid grid-cols-2 md:grid-cols-4 lg:grid-cols-5 gap-4 pt-16 pb-28 px-14 md:px-36"> - <FooterGroup className="lg:col-span-2"> - {/* logo in footer */} - <div className="flex items-center"> - <img - src="https://static.igem.wiki/teams/4275/wiki/logo-orange-ver.png" - alt="logo" - /> + <> + <footer className="footer p-10 bg-cyan-100"> + <div> + <span className="footer-title">Services</span> + <a className="link link-hover">Branding</a> + <a className="link link-hover">Design</a> + <a className="link link-hover">Marketing</a> + <a className="link link-hover">Advertisement</a> + </div> + <div> + <span className="footer-title">Company</span> + <a className="link link-hover">About us</a> + <a className="link link-hover">Contact</a> + <a className="link link-hover">Jobs</a> + <a className="link link-hover">Press kit</a> + </div> + <div> + <span className="footer-title">Legal</span> + <a className="link link-hover">Terms of use</a> + <a className="link link-hover">Privacy policy</a> + <a className="link link-hover">Cookie policy</a> </div> - </FooterGroup> - <FooterGroup> - <FooterTitle>About</FooterTitle> - <FooterLink>Profile</FooterLink> - <FooterLink>Features</FooterLink> - <FooterLink>Careers</FooterLink> - <FooterLink>DW News</FooterLink> - </FooterGroup> - <FooterGroup> - <FooterTitle>Help</FooterTitle> - <FooterLink>Support</FooterLink> - <FooterLink>Sign Up</FooterLink> - <FooterLink>Guide</FooterLink> - <FooterLink>Reports</FooterLink> - <FooterLink>Q&A</FooterLink> - </FooterGroup> - <FooterGroup> - <FooterTitle>Source</FooterTitle> - <FooterLink href="https://gitlab.igem.org/2022/greatbay-scie"> - GitLab - </FooterLink> - </FooterGroup> - <div className="flex items-center justify-center col-span-5 gap-4"> + </footer> + <footer className="footer px-10 py-4 border-t bg-cyan-100 border-base-300"> <a rel="license" href="http://creativecommons.org/licenses/by/4.0/" @@ -67,12 +36,16 @@ export const Footer = () => { </a> <div> All content licensed under a{" "} - <a rel="license" href="http://creativecommons.org/licenses/by/4.0/" className="hover:underline"> + <a + rel="license" + href="http://creativecommons.org/licenses/by/4.0/" + className="hover:underline" + > Creative Commons Attribution 4.0 International License </a> . </div> - </div> - </div> + </footer> + </> ); }; diff --git a/components/humanPracticeTimeline.jsx b/components/humanPracticeTimeline.jsx index 54ae9ef5cddb41301b106c3b0890e0e7d530288d..46a585548c20fb186e81cc494a5ed6215a8ff2ab 100644 --- a/components/humanPracticeTimeline.jsx +++ b/components/humanPracticeTimeline.jsx @@ -48,7 +48,7 @@ const Section = ({ wide, children }) => { export default function Timeline() { return ( - <div className="w-full h-[120vh] bg-gradient-to-br from-teal-900 to-cyan-800 overflow-x-scroll overflow-y-hidden py-14 gap-14 flex items-start"> + <div className="w-full py-32 bg-gradient-to-br from-teal-900 to-cyan-800 overflow-x-scroll overflow-y-hidden py-14 gap-14 flex items-start"> <Section> <Bar> <BarTitle>PART 1: Understanding the Problem</BarTitle> diff --git a/components/seo.jsx b/components/seo.jsx index 28d1308982c5dfc2ae6f75ed11f4b39a3c287480..288b6c8ea75a9faf1de53e96a43a5d2e97bd5933 100644 --- a/components/seo.jsx +++ b/components/seo.jsx @@ -6,6 +6,19 @@ export const SEO = ({ title, description }) => { <title>{title}</title> <meta name="description" content={description} /> <meta name="viewport" content="width=device-width, initial-scale=1" /> + <link + rel="icon" + type="image/png" + sizes="32x32" + href="/greatbay-scie/favicon-32x32.png" + /> + <link + rel="icon" + type="image/png" + sizes="16x16" + href="/greatbay-scie/favicon-16x16.png" + /> + <link rel="shortcut icon" href="/greatbay-scie/favicon.ico" /> </Head> ); }; diff --git a/public/favicon.ico b/public/favicon.ico index 718d6fea4835ec2d246af9800eddb7ffb276240c..913c26123603bb875ff3b941b2a85c320e11466e 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/vercel.svg b/public/vercel.svg deleted file mode 100644 index fbf0e25a651c28931b2fe8afa2947e124eebc74f..0000000000000000000000000000000000000000 --- a/public/vercel.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg width="283" height="64" viewBox="0 0 283 64" fill="none" - xmlns="http://www.w3.org/2000/svg"> - <path d="M141.04 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.46 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM248.72 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.45 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM200.24 34c0 6 3.92 10 10 10 4.12 0 7.21-1.87 8.8-4.92l7.68 4.43c-3.18 5.3-9.14 8.49-16.48 8.49-11.05 0-19-7.2-19-18s7.96-18 19-18c7.34 0 13.29 3.19 16.48 8.49l-7.68 4.43c-1.59-3.05-4.68-4.92-8.8-4.92-6.07 0-10 4-10 10zm82.48-29v46h-9V5h9zM36.95 0L73.9 64H0L36.95 0zm92.38 5l-27.71 48L73.91 5H84.3l17.32 30 17.32-30h10.39zm58.91 12v9.69c-1-.29-2.06-.49-3.2-.49-5.81 0-10 4-10 10V51h-9V17h9v9.2c0-5.08 5.91-9.2 13.2-9.2z" fill="#000"/> -</svg> \ No newline at end of file