Merge pull request #134 from stratisproject/ui

Improve setup design, add window title
stratisproject · Jun 30, 2017 · bc353f3 · bc353f3
2 parents 4d04fd1 + 61ead59
commit bc353f3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/Breeze.UI/src/app/setup/setup.component.html b/Breeze.UI/src/app/setup/setup.component.html
@@ -1,15 +1,18 @@
 <section id="breeze">
   <div class="login d-flex align-items-center text-center">
     <div class="container">
+      <!--<p class="text-back text-left mb-5 col-6 row">
+        <button type="button" class="btn btn-link text-back" (click)="onBackClicked()">Back</button>
+      </p>-->
+      <p class="text-back text-left mb-5 col-6 row"><a (click)="onBackClicked()">Back</a></p>
       <h3 class="display-5">Welcome</h3>
       <p class="lead">
         If you would like to create a new wallet, please click Create. <br/>
         When you have used Breeze before, you can click Restore to recover your wallet.
       </p>
       <div class="row d-flex justify-content-center">
-        <button type="button" class="btn btn-darkgray btn-lg" (click)="onBackClicked()">Back</button>
         <button type="button" class="btn btn-darkgray btn-lg" (click)="onCreateClicked()">Create</button>
-        <button type="button" class="btn btn-darkgray btn-lg" (click)="onRecoverClicked()">Restore</button>
+        <button type="button" class="btn btn-linkgray btn-lg" (click)="onRecoverClicked()">Restore</button>
       </div>
     </div>
     <!-- /container-->

diff --git a/Breeze.UI/src/app/wallet/dashboard/dashboard.component.html b/Breeze.UI/src/app/wallet/dashboard/dashboard.component.html
@@ -63,7 +63,7 @@ <h5 class="text-uppercase">Latest Transactions</h5>
           <!-- /card-->
         </div>
       </div>
-      <ng-template #noTransactions>Looks like you haven't made any transactions yet</ng-template>
+      <ng-template #noTransactions class="text-muted">Looks like you haven't made any transactions yet</ng-template>
     </section>
     <!-- /TRANSACTIONS -->
     <status-bar></status-bar>

diff --git a/Breeze.UI/src/app/wallet/history/history.component.html b/Breeze.UI/src/app/wallet/history/history.component.html
@@ -37,7 +37,7 @@ <h5 class="text-uppercase">Transactions</h5>
       </div>
       <!-- /card-->
       <div>
-        <ng-template #noTransactions>Looks like you haven't made any transactions yet.</ng-template>
+        <ng-template #noTransactions class="text-muted">Looks like you haven't made any transactions yet.</ng-template>
       </div>
     </section>
     <!-- /TRANSACTIONS -->

diff --git a/Breeze.UI/src/index.html b/Breeze.UI/src/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Breeze</title>
+  <title>Breeze Wallet v0.1.0 alpha</title>
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 </head>
 <body>

diff --git a/Breeze.UI/src/styles.css b/Breeze.UI/src/styles.css
@@ -617,10 +617,10 @@ input.cmn-toggle-round-flat:checked + label:after {
       color: #366a96; }
   .login .container form {
     margin-bottom: 4em; }
-  .login .container .textback a {
-    color: #C0BECC;
+  .login .container .textback .text-back {
+    color: #C0BECC !important;
     text-decoration: underline; }
-    .login .container .textback a:hover {
+    .login .container .textback:hover {
       text-decoration: none; }
   .login .container .badge {
     margin: .5em auto; }