Merge pull request #2535 from vhpoet/release

[TASK] Show login on first login
ripple · Jun 2, 2015 · fe9c259 · fe9c259
2 parents 17001d8 + 777aee3
commit fe9c259
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/less/ripple/landing.less b/src/less/ripple/landing.less
@@ -276,9 +276,8 @@ header.loggedOut {
 	}
 
 	.loginWrapper {
+      margin: 20px 0 -30px;
 		text-align: center;
-		width: 50%;
-		display: inline-block;
 	}
 
 	.tabAdjust {

diff --git a/src/templates/client/layout.jade b/src/templates/client/layout.jade
@@ -48,12 +48,8 @@ div#wrapper
 
       .loginContainer
 
-        // Register
-        .container-fluid.main(ng-if="!showLogin && showRegister", id="t-register", role="main")
-          include ../tabs/register.jade
-
         // Login
-        .container-fluid.main(ng-if="showLogin && !showRegister", id="t-login", role="main")
+        .container-fluid.main(ng-if="showLogin || showRegister", id="t-login", role="main")
           include ../tabs/login.jade
 
         // Main

diff --git a/src/templates/tabs/login.jade b/src/templates/tabs/login.jade
@@ -6,8 +6,8 @@ section.col-xs-12.content(ng-controller="LoginCtrl")
       hr
       p.heroText(l10n) Trade hundreds of assets, from XRP to crypto to gold to fiat.
     .auth-form-wrapper.col-xs-12.col-sm-6.col-md-4
-      //.tabAdjust
-        .signUpWrapper
+      .tabAdjust
+        //.signUpWrapper
           h2.signUpTop
             a(href='#register', l10n-inc) Sign Up
         .loginWrapper