diff --git a/package-lock.json b/package-lock.json index 00ed931..2c43a96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5826,6 +5826,11 @@ "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "dev": true }, + "yarn": { + "version": "1.22.17", + "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.17.tgz", + "integrity": "sha512-H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ==" + }, "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index 4722eba..b09f39d 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,8 @@ "next-seo": "^4.23.0", "react": "^17.0.2", "react-dom": "^17.0.2", - "styled-jsx-plugin-postcss": "^4.0.1" + "styled-jsx-plugin-postcss": "^4.0.1", + "yarn": "^1.22.17" }, "devDependencies": { "@next/bundle-analyzer": "^10.1.2", diff --git a/public/assets/images/inter1.png b/public/assets/images/inter1.png new file mode 100644 index 0000000..ddd659a Binary files /dev/null and b/public/assets/images/inter1.png differ diff --git a/public/assets/images/yelunderline.png b/public/assets/images/yelunderline.png new file mode 100644 index 0000000..57a9d18 Binary files /dev/null and b/public/assets/images/yelunderline.png differ diff --git a/src/hero/HeroOneButton.tsx b/src/hero/HeroOneButton.tsx index 253106f..6ec1cfd 100644 --- a/src/hero/HeroOneButton.tsx +++ b/src/hero/HeroOneButton.tsx @@ -11,6 +11,10 @@ const HeroOneButton = (props: IHeroOneButtonProps) => (

{props.title}

+
{props.description}
{props.button} diff --git a/src/layout/Section.tsx b/src/layout/Section.tsx index 1645bdd..d9a86eb 100644 --- a/src/layout/Section.tsx +++ b/src/layout/Section.tsx @@ -4,11 +4,13 @@ type ISectionProps = { title?: string; description?: string; yPadding?: string; + background?: string; children: ReactNode; + maxWidth?: string; }; const Section = (props: ISectionProps) => ( -
+
{(props.title || props.description) && (
{props.title &&

{props.title}

} diff --git a/src/navigation/NavbarTwoColumns.tsx b/src/navigation/NavbarTwoColumns.tsx index 66add74..4b299a2 100644 --- a/src/navigation/NavbarTwoColumns.tsx +++ b/src/navigation/NavbarTwoColumns.tsx @@ -2,37 +2,43 @@ import React, { ReactNode } from 'react'; import Link from 'next/link'; +import className from 'classnames'; + type INavbarProps = { logo: ReactNode; children: ReactNode; }; -const NavbarTwoColumns = (props: INavbarProps) => ( -
-
- - {props.logo} - -
+const NavbarTwoColumns = (props: INavbarProps) => { + const navbarTwoColumnClass = className('flex', 'flex-wrap', 'justify-between', 'items-center'); + + return ( +
+
+ + {props.logo} + +
+ + - - - -
-); + +
+ ); +}; export { NavbarTwoColumns }; diff --git a/src/templates/commons/Logo.tsx b/src/templates/commons/Logo.tsx index 831aeda..ff1f0fe 100644 --- a/src/templates/commons/Logo.tsx +++ b/src/templates/commons/Logo.tsx @@ -11,7 +11,7 @@ const Logo = (props: ILogoProps) => { const fontStyle = props.xl ? 'font-semibold text-3xl' : 'font-semibold text-xl'; return ( - + { @@ -57,43 +57,43 @@ const Logo = (props: ILogoProps) => { @@ -101,41 +101,41 @@ const Logo = (props: ILogoProps) => { diff --git a/src/templates/landing-page/Hero.tsx b/src/templates/landing-page/Hero.tsx index 0aa25b7..c8a764d 100644 --- a/src/templates/landing-page/Hero.tsx +++ b/src/templates/landing-page/Hero.tsx @@ -10,8 +10,12 @@ import { NavbarTwoColumns } from '../../navigation/NavbarTwoColumns'; import { Logo } from '../commons/Logo'; const Hero = () => ( - -
+ +
}>
  • @@ -20,30 +24,37 @@ const Hero = () => (
  • - dApp + DApp
    • - -
    - - {'The Best Memes, ever.\n'} - Built and Governed on Neo N3 - - } - description="Propose new ones, vote on the best, and dump the shittiest..." - button={ - - - - - - } - /> -
    +
    +
    + + {'The Best Memes, ever.\n'} + Built and Governed on Neo N3 + + } + description="Propose new ones, vote on the best, and dump the shittiest..." + button={ + + + + + + } + /> +
    + +
    +
    +
    ); diff --git a/tailwind.config.js b/tailwind.config.js index 4490fc2..9c125c8 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -40,7 +40,7 @@ module.exports = { }, }, lineHeight: { - hero: '4.5rem', + hero: '3.5rem', }, }, },