mirror of
https://github.com/ascribe/onion.git
synced 2024-12-22 17:33:14 +01:00
styling again
This commit is contained in:
parent
e49b920318
commit
97f8d416af
@ -15,15 +15,18 @@ let PrizeApp = React.createClass({
|
||||
|
||||
render() {
|
||||
let header = null;
|
||||
if (this.isActive('pieces')) {
|
||||
header = null;
|
||||
if (this.isActive('landing') || this.isActive('login') || this.isActive('signup')) {
|
||||
header = <Hero />;
|
||||
} else {
|
||||
header = <Header />;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="wp">
|
||||
<Hero />
|
||||
<div className="ascribe-prize-app">
|
||||
{header}
|
||||
<div className="wp">
|
||||
<RouteHandler />
|
||||
</div>
|
||||
<GlobalNotification />
|
||||
<div id="modal" className="container"></div>
|
||||
</div>
|
||||
|
@ -11,6 +11,7 @@ import PrizeRegisterPiece from './components/register_piece';
|
||||
import PrizePieceList from './components/piece_list';
|
||||
import PieceContainer from '../../ascribe_detail/piece_container';
|
||||
import EditionContainer from '../../ascribe_detail/edition_container';
|
||||
import SettingsContainer from '../../../components/settings_container';
|
||||
|
||||
import App from './app';
|
||||
import AppConstants from '../../../constants/application_constants';
|
||||
@ -30,6 +31,7 @@ function getRoutes(commonRoutes) {
|
||||
<Route name="pieces" path="collection" handler={PrizePieceList} />
|
||||
<Route name="piece" path="pieces/:pieceId" handler={PieceContainer} />
|
||||
<Route name="edition" path="editions/:editionId" handler={EditionContainer} />
|
||||
<Route name="settings" path="settings" handler={SettingsContainer} />
|
||||
</Route>
|
||||
);
|
||||
}
|
||||
|
@ -1 +1,6 @@
|
||||
@import 'landing'
|
||||
@import 'landing';
|
||||
|
||||
.ascribe-prize-app {
|
||||
border-radius: 0;
|
||||
padding-top: 70px;
|
||||
}
|
||||
|
@ -2,13 +2,15 @@
|
||||
background-color: #FDFDFD;
|
||||
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
/* We need this, otherwise piece list will have a scrollbar */
|
||||
overflow-y: hidden;
|
||||
}
|
||||
|
||||
.hero {
|
||||
font-family: 'Nunito', sans-serif;
|
||||
font-weight: 300;
|
||||
|
||||
> .hero {
|
||||
|
||||
overflow: hidden;
|
||||
text-align: center;
|
||||
|
||||
@ -17,10 +19,11 @@
|
||||
margin-bottom: 5em;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.wp-landing-wrapper {
|
||||
text-align: center;
|
||||
font-family: 'Nunito', sans-serif;
|
||||
font-weight: 300;
|
||||
|
||||
> .enter {
|
||||
margin-top: 2em;
|
||||
|
Loading…
Reference in New Issue
Block a user