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.

Sign up for GitHub

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

Page/role inspection merge develop #31

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Page/role inspection merge develop #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee4c984
new role-inspection according figma
therealharpaljadeja Jul 30, 2022
10d57a5
Merge remote-tracking branch 'origin/develop' into page/role-inspecti…
therealharpaljadeja Jul 30, 2022
c5385d3
role-inspection done with all data available
therealharpaljadeja Aug 2, 2022
2367a57
page/role-inspection develop merge conflicts resolved
therealharpaljadeja Aug 7, 2022
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
38 changes: 19 additions & 19 deletions components/layout/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ import BurgerMenu from "./BurgerMenu";
import WhatIsSoil from "./WhatIsSoil";

export default function Header() {
return (
<header className="px-3 pt-2 mb-4">
<nav
className="relative bg-white max-w-7xl px-4 h-16 sm:px-5 lg:px-6 rounded-full flex items-center justify-between"
aria-label="Top"
>
<Link href="/">
<a>
<span className="text-2xl">🌱</span>
<span className="text-soilGreen-70 text-xl font-bold ml-2">
Soil.
</span>
</a>
</Link>
<WhatIsSoil />
<BurgerMenu />
</nav>
</header>
);
return (
<header className="w-full py-4">
<nav
className="relative bg-white px-4 h-16 sm:px-5 lg:px-6 rounded-full flex items-center justify-between"
aria-label="Top"
>
<Link href="/">
<a>
<span className="text-2xl">🌱</span>
<span className="text-soilGreen-70 text-xl font-bold ml-2">
Soil.
</span>
</a>
</Link>
<WhatIsSoil />
<BurgerMenu />
</nav>
</header>
);
}
20 changes: 10 additions & 10 deletions components/layout/Layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import Header from "./Header";

function Layout({ children }) {
return (
<section className="bg-bgGrey min-h-screen">
<div className="w-full max-w-screen-xl mx-auto">
<Header />
<div className="relative mx-6">
<main>{children}</main>
</div>
</div>
</section>
);
return (
<section className="bg-bgGrey w-full flex flex-col h-screen overflow-hidden">
<div className="w-full h-full flex flex-col max-w-full items-center px-72">
<Header />
<div className="relative flex-1">
<main className="h-[100%]">{children}</main>
</div>
</div>
</section>
);
}

export default Layout;
Loading