-
Notifications
You must be signed in to change notification settings - Fork 1
About page #60
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.
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
base: master
Are you sure you want to change the base?
About page #60
Changes from 3 commits
7768694
bd4d857
d31002d
7b9b12c
a47a351
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| .full-screen { | ||
| min-height: 100vh; | ||
| min-width: 100vw; | ||
| height: auto; | ||
| width: auto; | ||
| position: absolute; | ||
| top: 0; | ||
| bottom: 0; | ||
| left: 0; | ||
| right: 0; | ||
| padding: 0; | ||
| background-position: top center; | ||
| background-repeat: no-repeat; | ||
| background-size: cover; | ||
| background-color: #fff; | ||
| z-index: -100; | ||
| overflow: auto; | ||
| } | ||
|
|
||
| #about-page { | ||
| background-image: url('http://lorempixel.com/output/cats-q-c-1600-1000-9.jpg'); | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| html, body { | ||
| height: 100%; | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| @mixin background-size($size) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Now being used in latest commit. |
||
| -webkit-background-size: $size; | ||
| -moz-background-size: $size; | ||
| -o-background-size: $size; | ||
| background-size: $size; | ||
| } | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,8 @@ | ||
| --- | ||
| # These lines are for Jekyll | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why are these lines needed?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The 6 dashes are a Jekyll thing, so Jekyll knows it's has to do something with the file. |
||
| --- | ||
|
|
||
| @import "background"; | ||
| @import | ||
| "mixins", | ||
| "images" | ||
| ; | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,14 +13,15 @@ export default class Layout extends React.Component { | |
| render() { | ||
| return ( | ||
| <div className="page-wrap"> | ||
| <Nav /> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will be addressed in the pull request for #10. Can it be removed from this pull request pretty please? |
||
|
|
||
| <div className="container-fluid"> | ||
|
|
||
| <div className="container-fluid p-0 m-0"> | ||
| <Nav /> | ||
| <div className="wrapper"> | ||
| { this.props.children } | ||
| </div> | ||
| </div> | ||
|
|
||
| <Footer /> | ||
| </div> | ||
| ); | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ export default class Nav extends React.Component { | |
| }); | ||
|
|
||
| return ( | ||
| <nav className="navbar navbar-fixed-top"> | ||
| <nav className="navbar navbar-default"> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will be addressed in the pull request for #10. Can it be removed from this pull request pretty please? |
||
| <a className="navbar-brand" href="/#/home"> Draw My Life</a> | ||
| <button className="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2" aria-controls="exCollapsingNavbar2" aria-expanded="false" aria-label="Toggle navigation"> | ||
| ☰ | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,26 @@ | ||
| import React from 'react'; | ||
| import { PageHeader } from 'react-bootstrap-4'; | ||
| import { PageHeader, Grid, Row, Col, Image } from 'react-bootstrap-4'; | ||
| import { about } from '../../copy/about.js'; | ||
|
|
||
| export default class About extends React.Component { | ||
| render() { | ||
| return ( | ||
| <div className="container"> | ||
| <PageHeader>{ about.title }</PageHeader> | ||
| <p>{ about.lorem }</p> | ||
| <div id="about-page" className="full-screen"> | ||
| <div className="container pt-5"> | ||
| <Grid> | ||
| <Row> | ||
| <Col xs={12} sm={7} md={6} mdOffset={1} smOffset={1}> | ||
| <div className="pt-5"> | ||
| <PageHeader>{ about.title }</PageHeader> | ||
| <p>{ about.lorem }</p> | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Blank line?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed in latest commit. |
||
| <h2>{ about.subtitle }</h2> | ||
| <p>{ about.lorem }</p> | ||
| </div> | ||
| </Col> | ||
| </Row> | ||
| </Grid> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we are having a background image covering the whole view, is this
background-colorneeded?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed in latest commit.