Fix UI for login page when using URIs (RT-2980)

ripple · May 4, 2015 · 04fd2ed · 04fd2ed
1 parent b68e369
commit 04fd2ed
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/src/less/ripple/content.less b/src/less/ripple/content.less
@@ -195,6 +195,11 @@ h1 {
   p.literal, span.literal, a.literal {
     font: 16px 'OpenSansRegular';
 
+    &.landing {
+      font-size: 14px;
+      color: @landingblue;
+    }
+
     strong {
       font-family: 'OpenSansBold';
       font-weight: normal;
@@ -214,6 +219,7 @@ h1 {
   p.hint {
     font-size: 1em;
     margin-top: 0;
+    color: @landingblue;
   }
 
   p.lit-small {

diff --git a/src/less/ripple/tabs/authorization.less b/src/less/ripple/tabs/authorization.less
@@ -315,9 +315,15 @@
         float: left;
     }
     .action-login {
+      .uri-form-container{
+        border-right: 1px solid @midgray;
+      }
         .info {
             font-family: OpenSansLight;
-            border-right: 1px solid @midgray;
+
+            padding: 0 40px;
+            background: rgba(76, 141, 184, .8);
+            border-radius: 5px;
             @media (max-width: @screen-xs-max) {
                 border-right: none;
             }
@@ -333,7 +339,7 @@
                 }
                 word-break: break-all;
                 font-size: 18px;
-                color: @black;
+                color: @landingblue;
             }
             .amount, .address {
                 margin-left: -@grid-gutter-width/2;

diff --git a/src/templates/tabs/login.jade b/src/templates/tabs/login.jade
@@ -44,7 +44,7 @@ section.col-xs-12.content(ng-controller="LoginCtrl")
 
 
   .row.action-login(ng-if="$routeParams.to")
-    .col-xs-12.col-sm-6.col-md-6
+    .col-xs-12.col-sm-6.col-md-6.uri-form-container
       div.info(ng-show="'send' == $route.current.tabName")
         p.literal(ng-bind="$routeParams.label")
         div(ng-hide="$routeParams.amount", l10n)
@@ -59,6 +59,8 @@ section.col-xs-12.content(ng-controller="LoginCtrl")
           p(l10n-inc) &#32;to&#32;
           .address {{ $routeParams.to | rpripplename:{tilde:true} }}
           | .
+        p(l10n-inc) Log in to your Ripple Trade account to continue. You 
+          | will be able to confirm this transaction on the next page.
       div.info(ng-show="'trust' == $route.current.tabName")
         p.literal {{$routeParams.label}}
         div(l10n)
@@ -73,17 +75,24 @@ section.col-xs-12.content(ng-controller="LoginCtrl")
             .amount
               span.currency {{$routeParams.amount | rpamount}} {{$routeParams.amount | rpcurrency}}
           | .
+        p(l10n-inc) Log in to your Ripple Trade account to continue. You 
+          | will be able to confirm this transaction on the next page.
 
       div.info(ng-show="'contacts' == $route.current.tabName")
         p.literal(ng-bind="$routeParams.label")
         span(l10n)
           p(l10n-inc) You're adding
           .address {{ $routeParams.to | rpripplename:{tilde:true} }}
           p(l10n-inc) to your contacts list
+        p(l10n-inc) Log in to your Ripple Trade account to continue. You 
+          | will be able to confirm this transaction on the next page.
+
 
     .col-xs-12.col-sm-6.col-md-5.col-lg-4.col-lg-offset-1.auth-form-container
       .auth-form-wrapper
         form(name='loginForm', ng-submit='submitForm()')
+          .loginWrapper
+            h2.loginTop(l10n) Log In
           include ../tabs/login/form
           .row
             .col-xs-12.text-status(ng-show='status')
@@ -96,6 +105,5 @@ section.col-xs-12.content(ng-controller="LoginCtrl")
               button.btn.btn-lg.btn-submit.btn-block.btn-primary(type='submit', ng-disabled="loginForm.$invalid || ajax_loading", l10n)
                 img(src="img/button-s.png", class="loader", ng-show="ajax_loading")
                 |  Log In
-          p.literal.hint(l10n) You can confirm this transaction on the next page.
-          p.literal(l10n) New to {{productName}}?&#32;
-            a(href='#/register', l10n-inc) Create a wallet
+          p.literal.landing(l10n) New to {{productName}}?&#32;
+            a(href='#/register', l10n-inc) Create an account