Skip to content

Commit

Permalink
Merge pull request #24 from codefordenver/dh-general-info
Browse files Browse the repository at this point in the history
Dh general info
  • Loading branch information
zacksabbath authored Apr 23, 2019
2 parents dd4cc3b + 2ceb17d commit c11d19e
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 3 deletions.
2 changes: 1 addition & 1 deletion frontend/public/assets/Exit_Plan-Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions frontend/src/App/App.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import './App.scss';
import Header from '../Header/Header.js';
import GeneralInfo from '../GeneralInfo/GeneralInfo.js';
import Main from '../Main/Main.js';
import Footer from '../Footer/Footer.js';

Expand All @@ -9,6 +10,7 @@ const App = () => {
return (
<main className="app-wrapper">
<Header />
<GeneralInfo />
<Main />
<Footer />
</main>
Expand Down
26 changes: 26 additions & 0 deletions frontend/src/GeneralInfo/GeneralInfo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import React from 'react';
import './GeneralInfo.scss';

const GeneralInfo = () => {
return (
<section className="general-info-container">
<object className="primary-logo" data="./assets/Exit_Plan-Logo.svg" alt="primary exit plan logo" height="1000" width="1000">
</object>
<div role="secondary container for general info" className="text-video-container">
<article className="left-container">
<h1>WHAT IS EXIT PLAN?</h1>
<p className="lead-text">
Coming out in a hostile environment is hard. When a member of a family comes out as LBGT or a member of a religious cult decides they want to leave, they can en up feeling like they've lost everything -- their family, their friends, their support structures, and financial support.
</p>
<p className="secondary-text">
With chat articles and resources Exit Plan is here to help!
</p>
</article>
<article className="right-container">
</article>
</div>
</section>
);
}

export default GeneralInfo;
43 changes: 43 additions & 0 deletions frontend/src/GeneralInfo/GeneralInfo.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
@import '../index.scss';

.primary-logo {
padding: 8px;
position: relative;
left: 600px;
}

.text-video-container {
display: flex;
justify-content: space-between;
margin: 0 40px;
}

h1 {
font-family: Helvetica, sans-serif;
font-size: 3rem;
font-weight: 600;
color: $dark-blue;
}

p {
font-family: Helvetica, sans-serif;
font-size: 1.5rem;
font-weight: 400;
line-height: 1.5;
color: $dark-blue;
}

.lead-text {
margin-bottom: 20px;
}

.left-container {
height: 300px;
width: 500px;
}
.right-container {
height: 350px;
width: 600px;
border: 3px solid $dark-blue;
}

4 changes: 2 additions & 2 deletions frontend/src/Header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import './Header.scss';
const Header = () => {
return (
<header>
<div role="logo-container" className="header-logo-container">
<article className="header-logo-container">
<img className="header-logo" src="./assets/Exit_Plan-SecondaryLogo.svg" alt="exit plan logo"/>
</div>
</article>
<Nav/>
</header>
)
Expand Down

0 comments on commit c11d19e

Please sign in to comment.