Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modal fixes & fixed consistency of icons #657

Merged
merged 3 commits into from
Jan 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/wallet/wallet/history/history.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,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>

Expand Down
1 change: 1 addition & 0 deletions src/app/wallet/wallet/history/history.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
}

.filter-card {
@extend %disable-select;
padding: 0;
margin-bottom: 16px;

Expand Down
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
6 changes: 3 additions & 3 deletions src/app/wallet/wallet/send/send.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,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">
Expand All @@ -137,8 +137,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">
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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 -->

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand All @@ -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;
}
Loading