Layout: Fix layout on /login

Automattic · Feb 2, 2016 · ab288b7 · ab288b7
1 parent 0bd07e0
commit ab288b7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/client/auth/controller.js b/client/auth/controller.js
@@ -9,14 +9,17 @@ import page from 'page';
 /**
  * Internal dependencies
  */
+import { setSection } from 'state/ui/actions';
 import LoginComponent from './login';
 import * as OAuthToken from 'lib/oauth-token';
 
 module.exports = {
-	login: function() {
+	login: function( context ) {
 		if ( OAuthToken.getToken() ) {
 			page( '/' );
 		} else {
+			context.store.dispatch( setSection( 'login', { hasSidebar: false } ) );
+
 			ReactDom.render(
 				React.createElement( LoginComponent, {} ),
 				document.getElementById( 'primary' )

diff --git a/client/auth/style.scss b/client/auth/style.scss
@@ -2,21 +2,25 @@
  * Oauth login page, used in WordPress Desktop App
  */
 
-html.is-desktop {
-	.logged-out-auth {
-		background: $blue-wordpress;
-
-		.wp-content {
-			margin: 0 auto;
-			overflow: hidden;
-			max-width: none;
-			padding-left: 0;
-			padding-right: 0;
-		}
+.is-section-login {
+	background: $blue-wordpress;
+	height: 100%;
 
-		.wp-content:after {
-			content: none;
-		}
+	.wp-content {
+		height: 100%;
+		margin: 0 auto;
+		overflow: hidden;
+		max-width: none;
+		padding-left: 0;
+		padding-right: 0;
+	}
+
+	.wp-content:after {
+		content: none;
+	}
+
+	.wp-primary {
+		height: 100%;
 	}
 }
 

diff --git a/client/layout/index.jsx b/client/layout/index.jsx
@@ -91,6 +91,10 @@ Layout = React.createClass( {
 	},
 
 	renderMasterbar: function() {
+		if ( 'login' === this.props.section ) {
+			return null;
+		}
+
 		if ( ! this.props.user ) {
 			return <MasterbarMinimal url="/" />;
 		}