1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00

styling again

This commit is contained in:
Tim Daubenschütz 2015-07-14 18:55:34 +02:00
parent e49b920318
commit 97f8d416af
4 changed files with 28 additions and 15 deletions

View File

@ -15,15 +15,18 @@ let PrizeApp = React.createClass({
render() { render() {
let header = null; let header = null;
if (this.isActive('pieces')) { if (this.isActive('landing') || this.isActive('login') || this.isActive('signup')) {
header = null; header = <Hero />;
} else {
header = <Header />;
} }
return ( return (
<div className="wp"> <div className="ascribe-prize-app">
<Hero />
{header} {header}
<div className="wp">
<RouteHandler /> <RouteHandler />
</div>
<GlobalNotification /> <GlobalNotification />
<div id="modal" className="container"></div> <div id="modal" className="container"></div>
</div> </div>

View File

@ -11,6 +11,7 @@ import PrizeRegisterPiece from './components/register_piece';
import PrizePieceList from './components/piece_list'; import PrizePieceList from './components/piece_list';
import PieceContainer from '../../ascribe_detail/piece_container'; import PieceContainer from '../../ascribe_detail/piece_container';
import EditionContainer from '../../ascribe_detail/edition_container'; import EditionContainer from '../../ascribe_detail/edition_container';
import SettingsContainer from '../../../components/settings_container';
import App from './app'; import App from './app';
import AppConstants from '../../../constants/application_constants'; import AppConstants from '../../../constants/application_constants';
@ -30,6 +31,7 @@ function getRoutes(commonRoutes) {
<Route name="pieces" path="collection" handler={PrizePieceList} /> <Route name="pieces" path="collection" handler={PrizePieceList} />
<Route name="piece" path="pieces/:pieceId" handler={PieceContainer} /> <Route name="piece" path="pieces/:pieceId" handler={PieceContainer} />
<Route name="edition" path="editions/:editionId" handler={EditionContainer} /> <Route name="edition" path="editions/:editionId" handler={EditionContainer} />
<Route name="settings" path="settings" handler={SettingsContainer} />
</Route> </Route>
); );
} }

View File

@ -1 +1,6 @@
@import 'landing' @import 'landing';
.ascribe-prize-app {
border-radius: 0;
padding-top: 70px;
}

View File

@ -2,13 +2,15 @@
background-color: #FDFDFD; background-color: #FDFDFD;
height: 100%; height: 100%;
width: 100%;
/* We need this, otherwise piece list will have a scrollbar */
overflow-y: hidden;
}
.hero {
font-family: 'Nunito', sans-serif; font-family: 'Nunito', sans-serif;
font-weight: 300; font-weight: 300;
> .hero {
overflow: hidden; overflow: hidden;
text-align: center; text-align: center;
@ -17,10 +19,11 @@
margin-bottom: 5em; margin-bottom: 5em;
} }
} }
}
.wp-landing-wrapper { .wp-landing-wrapper {
text-align: center; text-align: center;
font-family: 'Nunito', sans-serif;
font-weight: 300;
> .enter { > .enter {
margin-top: 2em; margin-top: 2em;