Merge branch 'dev' into feature/zap

particl · Jan 15, 2018 · 215a90a · 215a90a
2 parents efd9f89 + 23d21df
commit 215a90a
Show file tree

Hide file tree

Showing 12 changed files with 162 additions and 156 deletions.
diff --git a/src/app/wallet/wallet/address-book/modal/new-address-modal/new-address-modal.component.html b/src/app/wallet/wallet/address-book/modal/new-address-modal/new-address-modal.component.html
@@ -1,5 +1,5 @@
 <div mat-dialog-title>{{modalTitle}}</div>
-<button class="small-close_button pull-right" (click)="closeModal()">
+<button class="small-close_button pull-right" tabindex="-1" (click)="closeModal()">
   <mat-icon fontSet="partIcon" fontIcon="part-circle-remove"></mat-icon>
 </button>
 

diff --git a/src/app/wallet/wallet/addresslookup/addresslookup.component.scss b/src/app/wallet/wallet/addresslookup/addresslookup.component.scss
@@ -1,5 +1,9 @@
 @import "./src/assets/_config"; // import shared colors etc.
 
+.modal-content {
+  overflow: visible; // gets rid of vertical scrollbars (not needed here)
+}
+
 .search-address { // address/label search
   margin-top: 15px;
   .mat-icon {

diff --git a/src/app/wallet/wallet/history/history.component.html b/src/app/wallet/wallet/history/history.component.html
@@ -64,7 +64,7 @@
     </div>
 
     <button mat-button color="warn" class="clear-filters" (click)="clear()">
-      <mat-icon fontSet="partIcon" fontIcon="part-cross"></mat-icon>
+      <mat-icon fontSet="partIcon" fontIcon="part-clear-all"></mat-icon>
       Clear all filters
     </button>
 

diff --git a/src/app/wallet/wallet/history/history.component.scss b/src/app/wallet/wallet/history/history.component.scss
@@ -14,6 +14,7 @@
 }
 
 .filter-card {
+  @extend %disable-select;
   padding: 0;
   margin-bottom: 16px;
 

diff --git a/src/app/wallet/wallet/receive/modals/add-address-label/add-address-label.component.html b/src/app/wallet/wallet/receive/modals/add-address-label/add-address-label.component.html
@@ -1,6 +1,6 @@
 <div mat-dialog-title>Label for new {{ type }} address</div>
 
-<button class="small-close_button" (click)="dialogClose()">
+<button class="small-close_button" tabindex="-1" (click)="dialogClose()">
   <mat-icon fontSet="partIcon" fontIcon="part-circle-remove"></mat-icon>
 </button>
 

diff --git a/src/app/wallet/wallet/send/send.component.html b/src/app/wallet/wallet/send/send.component.html
@@ -128,7 +128,7 @@
             <mat-form-field fxFlex="1 1 100%" class="full-width larger">
               <input #address name="toAddress" matInput
                      [ngClass]="{'verify-sucess': checkAddress() === true, 'verify-error': checkAddress() === false }"
-                     type="text" placeholder="Recipient's address" [(ngModel)]="send.toAddress"
+                     type="text" placeholder="Receiver's address" [(ngModel)]="send.toAddress"
                      (ngModelChange)="verifyAddress()"/>
             </mat-form-field>
             <span fxFlex="0 0 20px">
@@ -140,8 +140,8 @@
                         (click)="pasteAddress()"></mat-icon>
             </span>
             <span fxFlex="0 0 20px">
-              <mat-icon matTooltip="Clear" (click)="clearReceiver()" color="warn" fontSet="partIcon"
-                        fontIcon="part-circle-remove"></mat-icon>
+              <mat-icon class="cursor-pointer" matTooltip="Clear" (click)="clearReceiver()"
+                        color="warn" fontSet="partIcon" fontIcon="part-circle-remove"></mat-icon>
             </span>
           </div>
           <mat-form-field class="full-width larger no-top-padding" floatPlaceholder="never">

diff --git a/src/app/wallet/wallet/shared/signature-address-modal/signature-address-modal.component.html b/src/app/wallet/wallet/shared/signature-address-modal/signature-address-modal.component.html
@@ -1,4 +1,4 @@
-<div class="containerX signature-address-container">
+<div class="containerX signature-address-container disable-select">
   <button class="small-close_button pull-right" (click)="dialogClose()">
     <mat-icon fontSet="partIcon" fontIcon="part-circle-remove"></mat-icon>
   </button>
@@ -23,20 +23,22 @@
 
       <div class="signature-address-modal-form">
 
-        <div class="address-field" fxLayout="row" fxLayoutGap="5px" fxLayoutAlign="center center">
+        <div class="address-field" fxLayout="row" fxLayoutAlign="center center">
           <mat-form-field fxFlex="1 1 100%">
             <input matInput formControlName="address" [(ngModel)]="formData.address" #addressInput
                     [ngClass]="{'verify-sucess': validAddress === true, 'verify-error': validAddress === false }"
                     placeholder="Enter a Particl address (e.g. PuMnFoGouqFkFZ1rs2PmVDUqp9psfQssre)"
                     (input)="verifyAddress()">
           </mat-form-field>
 
-          <span fxFlex="0 0 20px" matTooltip="Address Lookup" (click)="openLookup()">
-            <mat-icon class="cursor-pointer" fontSet="partIcon" fontIcon="part-people"></mat-icon>
-          </span>
-          <span fxFlex="0 0 20px" matTooltip="Paste" (click)="pasteAddress()">
-            <mat-icon class="cursor-pointer" fontSet="partIcon" fontIcon="part-past"></mat-icon>
-          </span>
+          <div class="icons" fxFlex="0 0 65px">
+            <span class="icon" matTooltip="Address Lookup" (click)="openLookup()">
+              <mat-icon class="cursor-pointer" fontSet="partIcon" fontIcon="part-people"></mat-icon>
+            </span>
+            <span class="icon" matTooltip="Paste" (click)="pasteAddress()">
+              <mat-icon class="cursor-pointer" fontSet="partIcon" fontIcon="part-past"></mat-icon>
+            </span>
+          </div>
 
         </div><!-- .address-field -->
 
@@ -47,7 +49,7 @@
         <mat-form-field>
           <input matInput formControlName="signature" [(ngModel)]="formData.signature"
                  [disabled]="isDisabled"
-                 placeholder="{{(type == 'sign')? 'Click `Sign Message` to generate signature': 'Signature'}}">
+                 placeholder="{{(type == 'sign')? 'Click [Sign Message] to generate signature': 'Signature'}}">
         </mat-form-field>
         <!-- todo: <mat-icon *ngIf="type == 'sign' && formData.signature" class="cursor-pointer" (click)="onCopyAddress()"
                  matTooltip="Copy address" ngxClipboard

diff --git a/src/app/wallet/wallet/shared/signature-address-modal/signature-address-modal.component.scss b/src/app/wallet/wallet/shared/signature-address-modal/signature-address-modal.component.scss
@@ -8,9 +8,10 @@
   display: flex;
   flex-direction: column;
   margin-top: 15px;
-  .address-field {
+  .icons { // address lookup/paste icons
+    text-align: right;
     .icon {
-      font-size: 16px;
+      margin-left: 10px;
     }
   }
 }
@@ -19,13 +20,8 @@
   width: 100%;
 }
 
-.mat-dialog-actions {
-  .mat-icon {
-    font-size: 16px;
-    width: auto;
-    height: auto;
-    position: relative;
-    top: -1px;
-    margin-right: 2px;
-  }
+.mat-icon {
+  height: auto;
+  width: auto;
+  font-size: 16px;
 }