Skip to content

Commit

Permalink
feat: Close Emma (#36)
Browse files Browse the repository at this point in the history
* Remove pages

* remove partner

* Add some links
  • Loading branch information
deniaz authored Apr 28, 2020
1 parent 99c7949 commit 3fbf992
Show file tree
Hide file tree
Showing 10 changed files with 75 additions and 698 deletions.
1 change: 1 addition & 0 deletions public/img/logo-close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 10 additions & 14 deletions src/assets/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@
@import url('https://fonts.googleapis.com/css?family=Nanum+Pen+Script&display=swap&text=Emma+bringts!');
@import url('https://fonts.googleapis.com/css?family=Montserrat:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i&display=swap');

textarea:focus, input:focus, button:focus{
textarea:focus,
input:focus,
button:focus {
outline: none;
}

body {
@apply text-gray-900;
@apply bg-emma-yellow-400;
}

h1 {
Expand All @@ -32,7 +35,6 @@ a {
@apply text-emma-purple-800;
}


p {
@apply pb-4;
}
Expand Down Expand Up @@ -93,7 +95,7 @@ p {
}

.navi .menu {
@apply w-full block flex-row justify-center mt-6 hidden ;
@apply w-full block flex-row justify-center mt-6 hidden;
}

.navi.open .menu {
Expand All @@ -104,7 +106,6 @@ p {
@apply text-base text-gray-900 py-3 font-medium rounded block;
}


.navi .btn {
@apply btn mt-6 block;
}
Expand All @@ -113,7 +114,6 @@ p {
@apply text-purple-800;
}


/*****
*
* Hero
Expand Down Expand Up @@ -312,7 +312,6 @@ p {
}
}


/*****
*
* Content Secation
Expand All @@ -324,11 +323,11 @@ p {
}

.content-secation {
@apply w-full mx-auto bg-white p-4 pt-12 flex-row justify-between items-start;
@apply w-full mx-auto bg-white p-4 pt-12 flex-row justify-between items-start;
}

.content-secation.content-secation-hero {
@apply bg-emma-yellow-400 flex-row-reverse items-center justify-between mb-0 mt-8 overflow-scroll;
@apply bg-emma-yellow-400 flex-row-reverse items-center justify-between mb-0 mt-8 overflow-scroll;
}

.content-secation h2 {
Expand All @@ -338,9 +337,7 @@ p {
@apply w-full;
}


@screen lg {

/*****
*
* Content Secation
Expand All @@ -352,23 +349,22 @@ p {
}

.content-secation h2 {
@apply mt-24 mb-8 text-4xl;;
@apply mt-24 mb-8 text-4xl;
}
.content-secation .text {
@apply w-1/2;
}
.content-secation img {
@apply w-1/2 pr-16;
}

.content-secation.content-secation-hero {
@apply shadow-2xl ;
@apply shadow-2xl;
}

.content-secation.content-secation-hero img {
@apply pl-16 pr-0;
}


/*****
*
Expand Down
9 changes: 1 addition & 8 deletions src/components/navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,17 @@ export const Navigation: FC = () => {
<nav id="menuicon" className={classname(['container', 'emma-container', 'navi', menu ? 'open' : 'close'])}>
<Link href="/" passHref>
<a className="logo">
<img src="/img/logo-black.svg" alt="Workcation" />
<img src="/img/logo-close.svg" alt="Workcation" />
</a>
</Link>
<button className="menu-icon" onClick={handleClick}></button>
<div className="menu">
<Link href="/initiative" passHref>
<a className="navi-item">Helft Emma</a>
</Link>

<Link href="/unternehmen" passHref>
<a className="navi-item">Für Unternehmen</a>
</Link>
<Link href="/kontakt" passHref>
<a className="navi-item">Kontakt</a>
</Link>
<Link href="/mitmachen" passHref>
<a className="btn">Anbieter hinzufügen</a>
</Link>
</div>
</nav>
);
Expand Down
29 changes: 9 additions & 20 deletions src/compositions/hero.tsx
Original file line number Diff line number Diff line change
@@ -1,39 +1,28 @@
import { FC, ReactNode } from 'react';
import { FC } from 'react';
import { Navigation } from '../components/navigation';
import { Display } from '../identity/typography/display';
import { Lead } from '../identity/typography/lead';

type Props = {
title: string;
search: ReactNode;
children: ReactNode;
};

export const Hero: FC<Props> = ({ title, search, children }) => (
export const Hero: FC = () => (
<div className="hero-section">
<Navigation />

<div className="container emma-container">
<div className="hero-stage">
<div className="text">
<Display>Unterstütze den lokalen Handel!</Display>
<Display>Emma hat geschlossen :(</Display>

<Lead>
Finde Unternehmen, die während der ausserordentlichen Lage Ihre Produkte zum Abholen oder sogar eine
Heimlieferung anbieten.
Mit schwerem Herzen haben wir uns dazu entschlossen, Emma zu schliessen. Andere Projekte konnten in der kurzen
Zeit einen weitaus höheren Mehrwert für Unternehmen und Kunden generieren.
</Lead>
<Lead>Es war uns dennoch eine Freude. Bleibt gesund!</Lead>
</div>

<img className="img" src="/img/illus/illu-hero2.svg" alt="" />

</div>

{search}
<img className="img" src="/img/illus/illu-hero2.svg" alt="" />
</div>

<h2 className="text-center text-3xl font-semibold">{title}</h2>
</div>
<div className="container category-outer">
<div className="category-container">{children}</div>
<h2 className="text-center text-3xl font-semibold">Andere Projekte</h2>
</div>
</div>
);
3 changes: 0 additions & 3 deletions src/layout/stacked.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,5 @@ export const Stacked: FC<Props> = ({ children, title }) => (
</Head>

<main>{children}</main>
<div className="bg-emma-blue-400">
<div className="container emma-container pb-24"></div>
</div>
</div>
);
102 changes: 0 additions & 102 deletions src/pages/iframe-suche.tsx

This file was deleted.

Loading

1 comment on commit 3fbf992

@vercel
Copy link

@vercel vercel bot commented on 3fbf992 Apr 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.