Make watch page full width (override 800px page width)

This commit is contained in:
Alex Liebowitz 2016-05-23 08:16:14 -04:00
parent 6ac17ae675
commit 4977729409
9 changed files with 25 additions and 25 deletions

View file

@ -1,8 +1,3 @@
var appStyles = {
width: '800px',
marginLeft: 'auto',
marginRight: 'auto',
};
var App = React.createClass({ var App = React.createClass({
getInitialState: function() { getInitialState: function() {
// For now, routes are in format ?page or ?page=args // For now, routes are in format ?page or ?page=args
@ -46,24 +41,19 @@ var App = React.createClass({
}, },
render: function() { render: function() {
if (this.state.viewingPage == 'home') { if (this.state.viewingPage == 'home') {
var content = <HomePage />; return <HomePage />;
} else if (this.state.viewingPage == 'settings') { } else if (this.state.viewingPage == 'settings') {
var content = <SettingsPage />; return <SettingsPage />;
} else if (this.state.viewingPage == 'help') { } else if (this.state.viewingPage == 'help') {
var content = <HelpPage />; return <HelpPage />;
} else if (this.state.viewingPage == 'watch') { } else if (this.state.viewingPage == 'watch') {
var content = <WatchPage name={this.state.pageArgs}/>; return <WatchPage name={this.state.pageArgs}/>;
} else if (this.state.viewingPage == 'report') { } else if (this.state.viewingPage == 'report') {
var content = <ReportPage />; return <ReportPage />;
} else if (this.state.viewingPage == 'files') { } else if (this.state.viewingPage == 'files') {
var content = <MyFilesPage />; return <MyFilesPage />;
} else if (this.state.viewingPage == 'start') { } else if (this.state.viewingPage == 'start') {
var content = <StartPage />; return <StartPage />;
} }
return (
<div style={appStyles}>
{content}
</div>
);
} }
}); });

View file

@ -3,7 +3,7 @@
var HelpPage = React.createClass({ var HelpPage = React.createClass({
render: function() { render: function() {
return ( return (
<main> <main className="page">
<h1>Troubleshooting</h1> <h1>Troubleshooting</h1>
<p>Here are the most commonly encountered problems and what to try doing about them</p> <p>Here are the most commonly encountered problems and what to try doing about them</p>

View file

@ -281,7 +281,7 @@ var HomePage = React.createClass({
}, },
render: function() { render: function() {
return ( return (
<div> <div className="page">
<Header /> <Header />
<Discover /> <Discover />
</div> </div>

View file

@ -125,7 +125,7 @@ var MyFilesPage = React.createClass({
} }
} }
return ( return (
<main> <main className="page">
<h1>My files</h1> <h1>My files</h1>
{content} {content}
<section> <section>

View file

@ -20,7 +20,7 @@ var ReportPage = React.createClass({
}, },
render: function() { render: function() {
return ( return (
<main> <main className="page">
<h1>Report a bug</h1> <h1>Report a bug</h1>
<section> <section>
<p>Please describe the problem you experienced and any information you think might be useful to us. Links to screenshots are great!</p> <p>Please describe the problem you experienced and any information you think might be useful to us. Links to screenshots are great!</p>

View file

@ -73,7 +73,7 @@ var SettingsPage = React.createClass({
} }
return ( return (
<main> <main className="page">
<h1>Settings</h1> <h1>Settings</h1>
<section> <section>
<h4>Run on startup</h4> <h4>Run on startup</h4>

View file

@ -4,7 +4,7 @@ var StartPage = React.createClass({
}, },
render: function() { render: function() {
return ( return (
<main> <main className="page">
<h1>LBRY has closed</h1> <h1>LBRY has closed</h1>
<Link href="lbry://lbry" label="Click here to start LBRY" /> <Link href="lbry://lbry" label="Click here to start LBRY" />
</main> </main>

View file

@ -1,6 +1,6 @@
var videoStyle = { var videoStyle = {
width: '100%', width: '100%',
height: '100%', // height: '100%',
backgroundColor: '#000' backgroundColor: '#000'
}; };
@ -39,7 +39,7 @@ var WatchPage = React.createClass({
}, },
render: function() { render: function() {
return ( return (
<main> <main className="page full-width">
<div className={this.state.readyToPlay ? 'hidden' : ''}> <div className={this.state.readyToPlay ? 'hidden' : ''}>
<h3>Loading lbry://{this.props.name}</h3> <h3>Loading lbry://{this.props.name}</h3>
{this.state.loadStatusMessage}... {this.state.loadStatusMessage}...

View file

@ -13,6 +13,16 @@ body
position: relative; position: relative;
} }
.page {
margin-left: auto;
margin-right: auto;
width: 800px;
&.full-width {
width: 100%;
}
}
section section
{ {
margin-bottom: $spacing-vertical; margin-bottom: $spacing-vertical;