diff --git a/js/components/whitelabel/prize/app.js b/js/components/whitelabel/prize/app.js index 98ca2a45..64657922 100644 --- a/js/components/whitelabel/prize/app.js +++ b/js/components/whitelabel/prize/app.js @@ -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 = ; + } else { + header =
; } return ( -
- +
{header} - +
+ +
diff --git a/js/components/whitelabel/prize/routes.js b/js/components/whitelabel/prize/routes.js index fd4c6edb..1f49dfbf 100644 --- a/js/components/whitelabel/prize/routes.js +++ b/js/components/whitelabel/prize/routes.js @@ -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) { + ); } diff --git a/sass/whitelabel/prize/index.scss b/sass/whitelabel/prize/index.scss index 203c0985..f2e97965 100644 --- a/sass/whitelabel/prize/index.scss +++ b/sass/whitelabel/prize/index.scss @@ -1 +1,6 @@ -@import 'landing' +@import 'landing'; + +.ascribe-prize-app { + border-radius: 0; + padding-top: 70px; +} diff --git a/sass/whitelabel/prize/landing.scss b/sass/whitelabel/prize/landing.scss index 2da8ac4d..d3a1f705 100644 --- a/sass/whitelabel/prize/landing.scss +++ b/sass/whitelabel/prize/landing.scss @@ -2,25 +2,28 @@ 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; - overflow: hidden; - text-align: center; - - > img { - margin-top: 5em; - margin-bottom: 5em; - } + > img { + margin-top: 5em; + margin-bottom: 5em; } } .wp-landing-wrapper { text-align: center; + font-family: 'Nunito', sans-serif; + font-weight: 300; > .enter { margin-top: 2em;