machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix titles height inconsistencies.

Browse Source
This commit is contained in:
Miguel Medeiros 2021-10-11 22:33:20 -03:00
parent f19b84090a
commit 9d9ff6ed91
No known key found for this signature in database
GPG Key ID: 819EDEE4673F3EBB
9 changed files with 105 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/app/components/address/address.component.html
View File

@ -1,13 +1,14 @@
<div class="container-xl"> <div class="container-xl">
<h1 i18n="shared.address">Address</h1> <div class="title-address">
<div class="tx-link"> <h1 i18n="shared.address">Address</h1>
<a [routerLink]="['/address/' | relativeUrl, addressString]" > <div class="tx-link">
<span class="d-inline d-lg-none">{{ addressString | shortenString : 18 }}</span> <a [routerLink]="['/address/' | relativeUrl, addressString]" >
<span class="d-none d-lg-inline">{{ addressString }}</span> <span class="d-inline d-lg-none">{{ addressString | shortenString : 18 }}</span>
</a> <span class="d-none d-lg-inline">{{ addressString }}</span>
<app-clipboard [text]="addressString"></app-clipboard> </a>
<app-clipboard [text]="addressString"></app-clipboard>
</div>
</div> </div>
<br>
<div class="clearfix"></div> <div class="clearfix"></div>

19
frontend/src/app/components/asset/asset.component.html
View File

@ -1,11 +1,14 @@
<div class="container-xl"> <div class="container-xl">
<h1 style="float: left;" i18n="asset|Liquid Asset page title">Asset</h1> <div class="title-asset">
<a [routerLink]="['/asset/' | relativeUrl, assetString]" style="line-height: 56px; margin-left: 10px;"> <h1 i18n="asset|Liquid Asset page title">Asset</h1>
<span class="d-inline d-lg-none">{{ assetString | shortenString : 24 }}</span> <div class="tx-link">
<span class="d-none d-lg-inline">{{ assetString }}</span> <a [routerLink]="['/asset/' | relativeUrl, assetString]">
</a> <span class="d-inline d-lg-none">{{ assetString | shortenString : 24 }}</span>
<app-clipboard [text]="assetString"></app-clipboard> <span class="d-none d-lg-inline">{{ assetString }}</span>
<br> </a>
<app-clipboard [text]="assetString"></app-clipboard>
</div>
</div>
<div class="clearfix"></div> <div class="clearfix"></div>
@ -77,7 +80,7 @@
<ng-template [ngIf]="isNativeAsset" [ngIfElse]="defaultAsset" i18n="Liquid native asset transactions title">Peg In/Out and Burn Transactions</ng-template> <ng-template [ngIf]="isNativeAsset" [ngIfElse]="defaultAsset" i18n="Liquid native asset transactions title">Peg In/Out and Burn Transactions</ng-template>
<ng-template #defaultAsset i18n="Default asset transactions title">Issuance and Burn Transactions</ng-template> <ng-template #defaultAsset i18n="Default asset transactions title">Issuance and Burn Transactions</ng-template>
</h2> </h2>
<app-transactions-list [transactions]="transactions" [showConfirmations]="true" (loadMore)="loadMore()"></app-transactions-list> <app-transactions-list [transactions]="transactions" [showConfirmations]="true" (loadMore)="loadMore()"></app-transactions-list>
<div class="text-center"> <div class="text-center">

21
frontend/src/app/components/asset/asset.component.scss
View File

@ -20,4 +20,23 @@
margin-top: 20px; margin-top: 20px;
margin-right: 0px; margin-right: 0px;
} }
} }
h1 {
margin: 0px;
padding: 0px;
margin-right: 15px;
@media (min-width: 576px) {
float: left;
}
}
.tx-link {
display: block;
width: 100%;
top: 14px;
position: relative;
@media (min-width: 768px) {
top: 20px;
}
}

16
frontend/src/app/components/block/block.component.html
View File

@ -2,8 +2,8 @@
<div class="title-block" id="block"> <div class="title-block" id="block">
<h1> <h1>
<ng-template [ngIf]="blockHeight === 0" i18n="block.genesis">Genesis <ng-template [ngIf]="blockHeight === 0" i18n="block.genesis">Genesis
<div class="next-previous-blocks"> <span class="next-previous-blocks">
<a *ngIf="showNextBlocklink" [routerLink]="['/block/' | relativeUrl, nextBlockHeight]" (click)="navigateToNextBlock()" i18n-ngbTooltip="Next Block" ngbTooltip="Next Block" placement="bottom"> <a *ngIf="showNextBlocklink" [routerLink]="['/block/' | relativeUrl, nextBlockHeight]" (click)="navigateToNextBlock()" i18n-ngbTooltip="Next Block" ngbTooltip="Next Block" placement="bottom">
<fa-icon [icon]="['fas', 'angle-left']" [fixedWidth]="true"></fa-icon> <fa-icon [icon]="['fas', 'angle-left']" [fixedWidth]="true"></fa-icon>
</a> </a>
@ -11,10 +11,10 @@
<span placement="bottom" class="disable"> <span placement="bottom" class="disable">
<fa-icon [icon]="['fas', 'angle-right']" [fixedWidth]="true"></fa-icon> <fa-icon [icon]="['fas', 'angle-right']" [fixedWidth]="true"></fa-icon>
</span> </span>
</div> </span>
</ng-template> </ng-template>
<ng-template [ngIf]="blockHeight" i18n="block.block"> Block <ng-template [ngIf]="blockHeight" i18n="block.block"> Block
<div class="next-previous-blocks"> <span class="next-previous-blocks">
<a *ngIf="showNextBlocklink" [routerLink]="['/block/' | relativeUrl, nextBlockHeight]" (click)="navigateToNextBlock()" i18n-ngbTooltip="Next Block" ngbTooltip="Next Block" placement="bottom"> <a *ngIf="showNextBlocklink" [routerLink]="['/block/' | relativeUrl, nextBlockHeight]" (click)="navigateToNextBlock()" i18n-ngbTooltip="Next Block" ngbTooltip="Next Block" placement="bottom">
<fa-icon [icon]="['fas', 'angle-left']" [fixedWidth]="true"></fa-icon> <fa-icon [icon]="['fas', 'angle-left']" [fixedWidth]="true"></fa-icon>
</a> </a>
@ -28,7 +28,7 @@
<span *ngIf="!showPreviousBlocklink" placement="bottom" class="disable"> <span *ngIf="!showPreviousBlocklink" placement="bottom" class="disable">
<fa-icon [icon]="['fas', 'angle-right']" [fixedWidth]="true"></fa-icon> <fa-icon [icon]="['fas', 'angle-right']" [fixedWidth]="true"></fa-icon>
</span> </span>
</div> </span>
</ng-template> </ng-template>
</h1> </h1>
@ -199,7 +199,7 @@
<div class="progress-bar progress-darklight" role="progressbar" [ngStyle]="{'width': txsLoadingStatus + '%' }"></div> <div class="progress-bar progress-darklight" role="progressbar" [ngStyle]="{'width': txsLoadingStatus + '%' }"></div>
</div> </div>
</ng-container> </ng-container>
</div> </div>
</ng-template> </ng-template>
<ngb-pagination class="pagination-container float-right" [collectionSize]="block.tx_count" [rotate]="true" [pageSize]="itemsPerPage" [(page)]="page" (pageChange)="pageChange(page, blockTxTitle)" [maxSize]="paginationMaxSize" [boundaryLinks]="true" [ellipses]="false"></ngb-pagination> <ngb-pagination class="pagination-container float-right" [collectionSize]="block.tx_count" [rotate]="true" [pageSize]="itemsPerPage" [(page)]="page" (pageChange)="pageChange(page, blockTxTitle)" [maxSize]="paginationMaxSize" [boundaryLinks]="true" [ellipses]="false"></ngb-pagination>
@ -207,7 +207,7 @@
</ng-template> </ng-template>
<ng-template [ngIf]="isLoadingBlock && !error"> <ng-template [ngIf]="isLoadingBlock && !error">
<div class="box"> <div class="box">
<div class="row"> <div class="row">
<div class="col-sm"> <div class="col-sm">

12
frontend/src/app/components/block/block.component.scss
View File

@ -18,7 +18,7 @@
} }
.fiat { .fiat {
display: block; display: block;
font-size: 13px; font-size: 13px;
@media (min-width: 768px) { @media (min-width: 768px) {
font-size: 14px; font-size: 14px;
@ -122,17 +122,17 @@ h1 {
} }
.next-previous-blocks { .next-previous-blocks {
font-size: 36px; font-size: 30px;
display: inline-block; display: inline-block;
vertical-align: bottom; @media (min-width: 768px) {
font-size: 36px;
}
a { a {
color: #1ad8f4; color: #1ad8f4;
&:hover, &:focus { &:hover, &:focus {
color: #09a3ba; color: #09a3ba;
display: inline-block; display: inline-block;
// transform: scale(1.2);
// transition: 150ms all ease-in-out;
} }
} }
} }
@ -140,4 +140,4 @@ h1 {
.disable { .disable {
font-size: 36px; font-size: 36px;
color: #393e5c73; color: #393e5c73;
} }

7
frontend/src/app/components/mempool-block/mempool-block.component.scss
View File

@ -4,13 +4,6 @@
top: 5px; top: 5px;
} }
.title-block {
color: #FFF;
padding-top: 20px;
padding-bottom: 3px;
border-top: 3px solid #FFF;
}
.fiat { .fiat {
font-size: 13px; font-size: 13px;
display: inline-block; display: inline-block;

14
frontend/src/app/components/transaction/transaction.component.html
View File

@ -9,18 +9,18 @@
</a> </a>
</div> </div>
<div> <ng-container>
<div class="title"> <h1 i18n="shared.transaction">Transaction</h1>
<h1 i18n="shared.transaction">Transaction</h1>
</div>
<div class="tx-link float-left"> <span class="tx-link float-left">
<a [routerLink]="['/tx/' | relativeUrl, txId]"> <a [routerLink]="['/tx/' | relativeUrl, txId]">
<span class="d-inline d-lg-none">{{ txId | shortenString : 24 }}</span> <span class="d-inline d-lg-none">{{ txId | shortenString : 24 }}</span>
<span class="d-none d-lg-inline">{{ txId }}</span> <span class="d-none d-lg-inline">{{ txId }}</span>
</a> </a>
<app-clipboard [text]="txId"></app-clipboard> <app-clipboard [text]="txId"></app-clipboard>
</div> </span>
<span class="grow"></span>
<div class="container-buttons"> <div class="container-buttons">
<ng-template [ngIf]="tx?.status?.confirmed"> <ng-template [ngIf]="tx?.status?.confirmed">
@ -34,7 +34,7 @@
<button type="button" class="btn btn-sm btn-danger" i18n="transaction.unconfirmed|Transaction unconfirmed state">Unconfirmed</button> <button type="button" class="btn btn-sm btn-danger" i18n="transaction.unconfirmed|Transaction unconfirmed state">Unconfirmed</button>
</ng-template> </ng-template>
</div> </div>
</div> </ng-container>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>

73
frontend/src/app/components/transaction/transaction.component.scss
View File

@ -2,53 +2,44 @@
padding: 0.55rem; padding: 0.55rem;
} }
.title-block {
color: #FFF;
padding-top: 20px;
border-top: 3px solid #FFF;
width: 100%;
padding-bottom: 30px;
display: flex;
flex-direction: column;
justify-content: space-between;
@media (min-width: 768px) {
padding-bottom: 0px;
}
}
h1{
margin-top: 2px;
margin-bottom: 0;
float: left;
margin-top: 2px;
@media (min-width: 768px){
margin-top: -8px;
}
}
.container-buttons { .container-buttons {
text-align: right; text-align: right;
width: 100%; align-self: start;
@media (min-width: 850px) { width: auto;
width: auto; margin-right: 15px;
right: 0;
position: absolute;
@media (min-width: 650px) {
right: auto;
margin-right: auto;
position: relative;
}
@media (min-width: 768px) {
align-self: center;
float: right; float: right;
} }
} }
.title-block {
height: 100px;
flex-direction: column;
h1 {
margin-bottom: 0rem;
}
@media (min-width: 650px) {
height: 80px;
flex-direction: row;
h1 {
margin-bottom: 1rem;
}
}
}
.tx-link { .tx-link {
display: block; display: flex;
width: auto; @media (min-width: 650px) {
margin-bottom: 10px; margin-left: 15px;
margin-left: 2px; align-self: end;
margin-top: 40px; margin-bottom: 3px;
position: absolute;
@media (min-width: 768px) {
margin-top: 14px;
margin-left: 10px;
position: relative;
text-align: left;
width: auto;
float: left;
} }
} }
@ -134,4 +125,4 @@ h1{
@media (min-width: 768px){ @media (min-width: 768px){
display: inline-block; display: inline-block;
} }
} }

12
frontend/src/styles.scss
View File

@ -197,6 +197,18 @@ body {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
height: 80px;
}
.title-address, .title-asset {
color: #FFF;
padding-top: 20px;
padding-bottom: 10px;
display: flex;
flex-direction: row;
justify-content: space-between;
height: 80px;
margin-top: -20px;
} }
.smaller-text { .smaller-text {