diff --git a/css/index.styl b/css/index.styl index 708765c..0f8a3d5 100644 --- a/css/index.styl +++ b/css/index.styl @@ -38,21 +38,35 @@ p { font: 18px/22px "Quicksand", sans-serif; text-align: center; margin: 0; + + &.notice { + margin: 10px 0; + } } -p.byline { - position: absolute; - bottom: 0; - margin-left: auto; - margin-right: auto; - margin-bottom: 15px; - left: 0; - right: 0; - font: 16px/22px "Quicksand", sans-serif; +body { + display: table; + width: 100%; } -p.notice { - margin: 10px 0; +.byline { + display: table-row; + font: 12px/40px "Quicksand", sans-serif; + text-align: center; + color: gray; + height: 40px; +} + +.container { + display: table-row; + vertical-align: center; +} + +.page { + display: flex + flex-direction: column; + justify-content: center; + height: 100%; } .drop-zone { diff --git a/lib/components/App.js b/lib/components/App.js index 9b75be5..0d0be25 100644 --- a/lib/components/App.js +++ b/lib/components/App.js @@ -47,10 +47,12 @@ export default class App extends React.Component { -

Cooked up by Alex Kern & Neeraj Baid while eating Sliver @ UC Berkeley. Fork us.

- {this.state.isSupported - ? - : } +
+ {this.state.isSupported + ? + : } +
+ diff --git a/lib/components/Centered.js b/lib/components/Centered.js deleted file mode 100644 index 69101e3..0000000 --- a/lib/components/Centered.js +++ /dev/null @@ -1,27 +0,0 @@ -import React from 'react' - -export default class Centered extends React.Component { - - render() { - return
-
- {this.props.children} -
-
- } - -} - -Centered.propTypes = { - hor: React.PropTypes.bool, - ver: React.PropTypes.bool -} - -Centered.defaultProps = { - hor: false, - ver: false -} diff --git a/lib/components/DownloadPage.js b/lib/components/DownloadPage.js index b2c4190..de693be 100644 --- a/lib/components/DownloadPage.js +++ b/lib/components/DownloadPage.js @@ -1,4 +1,3 @@ -import Centered from './Centered' import ChromeNotice from './ChromeNotice' import DownloadActions from '../actions/DownloadActions' import DownloadButton from './DownloadButton' @@ -39,7 +38,7 @@ export default class DownloadPage extends React.Component { render() { switch (this.state.status) { case 'ready': - return + return

FilePizza

- +
case 'requesting': case 'downloading': - return + return

FilePizza

- +
case 'cancelled': - return + return

FilePizza

- +
case 'done': - return + return

FilePizza

- +
} } diff --git a/lib/components/ErrorPage.js b/lib/components/ErrorPage.js index 57342e1..f03e1b0 100644 --- a/lib/components/ErrorPage.js +++ b/lib/components/ErrorPage.js @@ -1,4 +1,3 @@ -import Centered from './Centered' import ErrorStore from '../stores/ErrorStore' import React from 'react' import Spinner from './Spinner' @@ -22,7 +21,7 @@ export default class ErrorPage extends React.Component { } render() { - return + return
@@ -35,7 +34,7 @@ export default class ErrorPage extends React.Component { ?
{this.state.stack}
: null} - +
} } diff --git a/lib/components/UploadPage.js b/lib/components/UploadPage.js index 4541730..e103fc1 100644 --- a/lib/components/UploadPage.js +++ b/lib/components/UploadPage.js @@ -1,4 +1,3 @@ -import Centered from './Centered' import DropZone from './DropZone' import ProgressBar from './ProgressBar' import React from 'react' @@ -48,7 +47,7 @@ export default class UploadPage extends React.Component { case 'ready': return - +
@@ -61,23 +60,23 @@ export default class UploadPage extends React.Component { select a file

- +
case 'processing': - return + return

FilePizza

Processing...

- +
case 'uploading': var keys = Object.keys(this.state.peerProgress) keys.reverse() - return + return

FilePizza

@@ -93,7 +92,7 @@ export default class UploadPage extends React.Component { })}
-
+ } }