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

Merge pull request #873 from MiguelMedeiros/fix-height-title-components

Browse Source 
UI/UX: Fix height inconsistencies between components.
This commit is contained in:
softsimon 2021-10-29 12:14:26 +04:00 committed by GitHub
commit e33e4b1d71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 360 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/app/assets/assets.component.html
View File

@ -1,11 +1,11 @@
<div class="container-xl"> <div class="container-xl">
<h1 style="float: left;" i18n="Registered assets page header">Registered assets</h1> <div class="title-asset">
<br> <h1 i18n="Registered assets page header">Registered assets</h1>
</div>
<div class="clearfix"></div> <div class="clearfix"></div>
<form [formGroup]="searchForm" class="form-inline"> <form [formGroup]="searchForm" class="form-inline">
<div class="input-group m-2"> <div class="input-group mb-2">
<input style="width: 250px;" formControlName="searchText" type="text" class="form-control" i18n-placeholder="Search Assets Placeholder Text" placeholder="Search asset"> <input style="width: 250px;" formControlName="searchText" type="text" class="form-control" i18n-placeholder="Search Assets Placeholder Text" placeholder="Search asset">
<div class="input-group-append"> <div class="input-group-append">
<button [disabled]="!searchForm.get('searchText')?.value.length" class="btn btn-secondary" type="button" (click)="searchForm.get('searchText')?.setValue('');" autocomplete="off" i18n="Search Clear Button">Clear</button> <button [disabled]="!searchForm.get('searchText')?.value.length" class="btn btn-secondary" type="button" (click)="searchForm.get('searchText')?.setValue('');" autocomplete="off" i18n="Search Clear Button">Clear</button>
@ -27,7 +27,7 @@
<td>{{ asset.ticker }}</td> <td>{{ asset.ticker }}</td>
<td class="d-none d-md-block">{{ asset.entity && asset.entity.domain }}</td> <td class="d-none d-md-block">{{ asset.entity && asset.entity.domain }}</td>
<td><a [routerLink]="['/asset/' | relativeUrl, asset.asset_id]">{{ asset.asset_id | shortenString : 13 }}</a> <app-clipboard class="d-none d-sm-inline-block" [text]="asset.asset_id"></app-clipboard></td> <td><a [routerLink]="['/asset/' | relativeUrl, asset.asset_id]">{{ asset.asset_id | shortenString : 13 }}</a> <app-clipboard class="d-none d-sm-inline-block" [text]="asset.asset_id"></app-clipboard></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -52,7 +52,7 @@
<td><span class="skeleton-loader"></span></td> <td><span class="skeleton-loader"></span></td>
<td class="d-none d-md-block"><span class="skeleton-loader"></span></td> <td class="d-none d-md-block"><span class="skeleton-loader"></span></td>
<td><span class="skeleton-loader"></span></td> <td><span class="skeleton-loader"></span></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -68,4 +68,4 @@
</div> </div>
<br> <br>

9
frontend/src/app/assets/assets.component.scss
View File

@ -3,4 +3,11 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.title-asset {
h1 {
line-height: 1;
margin: 0px;
padding-bottom: 10px;
}
}

30
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>
@ -50,12 +51,13 @@
</div> </div>
<br> <br>
<div class="title-tx">
<h2> <h2>
<ng-template [ngIf]="!transactions?.length">&nbsp;</ng-template> <ng-template [ngIf]="!transactions?.length">&nbsp;</ng-template>
<ng-template i18n="X of X Address Transaction" [ngIf]="transactions?.length === 1">{{ (transactions?.length | number) || '?' }} of {{ txCount | number }} transaction</ng-template> <ng-template i18n="X of X Address Transaction" [ngIf]="transactions?.length === 1">{{ (transactions?.length | number) || '?' }} of {{ txCount | number }} transaction</ng-template>
<ng-template i18n="X of X Address Transactions (Plural)" [ngIf]="transactions?.length > 1">{{ (transactions?.length | number) || '?' }} of {{ txCount | number }} transactions</ng-template> <ng-template i18n="X of X Address Transactions (Plural)" [ngIf]="transactions?.length > 1">{{ (transactions?.length | number) || '?' }} of {{ txCount | number }} transactions</ng-template>
</h2> </h2>
</div>
<app-transactions-list [transactions]="transactions" [showConfirmations]="true" (loadMore)="loadMore()"></app-transactions-list> <app-transactions-list [transactions]="transactions" [showConfirmations]="true" (loadMore)="loadMore()"></app-transactions-list>

29
frontend/src/app/components/address/address.component.scss
View File

@ -35,17 +35,22 @@
h1 { h1 {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
margin-right: 10px;
font-size: 1.9rem;
@media (min-width: 576px) { @media (min-width: 576px) {
font-size: 2rem;
float: left; float: left;
margin-right: 10px; }
@media (min-width: 768px) {
font-size: 2.5rem;
} }
} }
.address-link { .address-link {
line-height: 56px; line-height: 56px;
margin-left: 0px; margin-left: 0px;
top: -2px; top: -2px;
position: relative; position: relative;
@media (min-width: 768px) { @media (min-width: 768px) {
line-height: 69px; line-height: 69px;
} }
@ -69,10 +74,20 @@ h1 {
.tx-link { .tx-link {
display: block; display: block;
width: 100%; height: 100%;
top: 14px; top: 9px;
position: relative; position: relative;
@media (min-width: 576px) {
top: 11px;
}
@media (min-width: 768px) { @media (min-width: 768px) {
top: 20px; top: 17px;
} }
} }
.title-tx {
h2 {
line-height: 1;
margin-bottom: 10px;
}
}

31
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>
@ -72,12 +75,14 @@
<br> <br>
<h2> <div class="title-tx">
<ng-template [ngIf]="transactions?.length" i18n="asset.M_of_N">{{ (transactions?.length | number) || '?' }} of {{ txCount | number }}&nbsp;</ng-template> <h2>
<ng-template [ngIf]="isNativeAsset" [ngIfElse]="defaultAsset" i18n="Liquid native asset transactions title">Peg In/Out and Burn Transactions</ng-template> <ng-template [ngIf]="transactions?.length" i18n="asset.M_of_N">{{ (transactions?.length | number) || '?' }} of {{ txCount | number }}&nbsp;</ng-template>
<ng-template #defaultAsset i18n="Default asset transactions title">Issuance 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>
</h2> <ng-template #defaultAsset i18n="Default asset transactions title">Issuance and Burn Transactions</ng-template>
</h2>
</div>
<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">

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

@ -20,4 +20,33 @@
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;
height: 100%;
top: 9px;
position: relative;
@media (min-width: 576px) {
top: 11px;
}
@media (min-width: 768px) {
top: 17px;
}
}
.title-tx {
h2 {
line-height: 1;
margin-bottom: 10px;
}
}

24
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>
@ -162,7 +162,7 @@
</div> </div>
<div #blockTxTitle id="block-tx-title" class="block-tx-title"> <div #blockTxTitle id="block-tx-title" class="block-tx-title">
<h2 class="float-left"> <h2>
<ng-container *ngTemplateOutlet="block.tx_count === 1 ? transactionsSingular : transactionsPlural; context: {$implicit: block.tx_count | number}"></ng-container> <ng-container *ngTemplateOutlet="block.tx_count === 1 ? transactionsSingular : transactionsPlural; context: {$implicit: block.tx_count | number}"></ng-container>
<ng-template #transactionsSingular let-i i18n="shared.transaction-count.singular">{{ i }} transaction</ng-template> <ng-template #transactionsSingular let-i i18n="shared.transaction-count.singular">{{ i }} transaction</ng-template>
<ng-template #transactionsPlural let-i i18n="shared.transaction-count.plural">{{ i }} transactions</ng-template> <ng-template #transactionsPlural let-i i18n="shared.transaction-count.plural">{{ i }} transactions</ng-template>
@ -175,14 +175,14 @@
<app-transactions-list [transactions]="transactions"></app-transactions-list> <app-transactions-list [transactions]="transactions"></app-transactions-list>
<ng-template [ngIf]="isLoadingTransactions"> <ng-template [ngIf]="isLoadingTransactions">
<div class="text-center mb-4 mt-3"> <div class="text-center mb-4" class="tx-skeleton">
<div class="header-bg box" style="padding: 10px; margin-bottom: 10px;"> <div class="header-bg box">
<span class="skeleton-loader"></span> <span class="skeleton-loader"></span>
</div> </div>
<div class="header-bg box"> <div class="header-bg box">
<div class="row" style="height: 107px;"> <div class="row">
<div class="col-sm"> <div class="col-sm">
<span class="skeleton-loader"></span> <span class="skeleton-loader"></span>
</div> </div>
@ -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">

69
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;
@ -40,10 +40,7 @@
h1 { h1 {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
@media (min-width: 576px) { line-height: 1;
float: left;
margin-right: 10px;
}
a { a {
&:hover, &:focus{ &:hover, &:focus{
text-decoration: none;; text-decoration: none;;
@ -87,32 +84,23 @@ h1 {
} }
.block-tx-title { .block-tx-title {
padding-top: 10px; display: flex;
display: block; justify-content: space-between;
text-align: right; flex-direction: column;
margin-top: -30px; margin-top: -15px;
position: relative;
@media (min-width: 550px) { @media (min-width: 550px) {
margin-top: 0px; margin-top: 1rem;
padding-top: 10px; flex-direction: row;
} }
h2 { h2 {
display: inline-block; line-height: 1;
float: left;
line-height: 1.6;
margin: 0; margin: 0;
margin-bottom: -15px;
padding-right: 10px;
padding-top: 15px;
position: relative; position: relative;
top: -22px; padding-bottom: 10px;
width: auto;
@media (min-width: 550px) { @media (min-width: 550px) {
padding-top: 0px; padding-bottom: 0px;
top: 0px; align-self: end;
}
@media (min-width: 768px) {
padding-top: 5px;
line-height: 1;
} }
} }
} }
@ -122,22 +110,41 @@ h1 {
} }
.next-previous-blocks { .next-previous-blocks {
font-size: 36px; font-size: 28px;
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;
} }
} }
} }
.disable { .disable {
font-size: 36px; font-size: 28px;
color: #393e5c73; color: #393e5c73;
} @media (min-width: 768px) {
font-size: 36px;
}
}
.tx-skeleton {
margin-top: 10px;
margin-bottom: 10px;
.header-bg {
&:first-child {
padding: 10px;
margin-bottom: 10px;
}
&:nth-child(2) {
.row {
height: 107px;
}
}
}
}

2
frontend/src/app/components/mempool-block/mempool-block.component.html
View File

@ -1,7 +1,7 @@
<div class="container-xl" *ngIf="mempoolBlock$ | async as mempoolBlock"> <div class="container-xl" *ngIf="mempoolBlock$ | async as mempoolBlock">
<div class="title-block"> <div class="title-block">
<h1 class="float-left">{{ ordinal$ | async }}</h1> <h1>{{ ordinal$ | async }}</h1>
<button [routerLink]="['/' | relativeUrl]" class="btn btn-sm float-right">&#10005;</button> <button [routerLink]="['/' | relativeUrl]" class="btn btn-sm float-right">&#10005;</button>
</div> </div>

9
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;
@ -31,9 +24,9 @@
h1 { h1 {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
line-height: 1;
@media (min-width: 576px) { @media (min-width: 576px) {
float: left; float: left;
margin-right: 10px;
} }
} }

24
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>
@ -192,15 +192,19 @@
<br> <br>
<h2 class="float-left" i18n="transaction.inputs-and-outputs|Transaction inputs and outputs">Inputs & Outputs</h2> <div class="title float-left">
<h2 i18n="transaction.inputs-and-outputs|Transaction inputs and outputs">Inputs & Outputs</h2>
</div>
<button type="button" class="btn btn-outline-info btn-sm float-right mr-1 mt-0 mt-md-2" (click)="txList.toggleDetails()" i18n="transaction.details|Transaction Details">Details</button> <button type="button" class="btn btn-outline-info btn-sm float-right" (click)="txList.toggleDetails()" i18n="transaction.details|Transaction Details">Details</button>
<div class="clearfix"></div> <div class="clearfix"></div>
<app-transactions-list #txList [transactions]="[tx]" [errorUnblinded]="errorUnblinded" [outputIndex]="outputIndex" [transactionPage]="true"></app-transactions-list> <app-transactions-list #txList [transactions]="[tx]" [errorUnblinded]="errorUnblinded" [outputIndex]="outputIndex" [transactionPage]="true"></app-transactions-list>
<h2 class="text-left" i18n="transaction.details">Details</h2> <div class="title">
<h2 i18n="transaction.details">Details</h2>
</div>
<div class="box"> <div class="box">
<table class="table table-borderless table-striped"> <table class="table table-borderless table-striped">
<tbody> <tbody>

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

@ -2,53 +2,48 @@
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 {
flex-direction: column;
@media (min-width: 650px) {
flex-direction: row;
}
h1 {
margin: 0rem;
line-height: 1;
}
}
.tx-link { .tx-link {
display: block; display: flex;
width: auto; margin-bottom: 0px;
margin-bottom: 10px; margin-top: 8px;
margin-left: 2px; @media (min-width: 650px) {
margin-top: 40px; align-self: end;
position: absolute; margin-left: 15px;
margin-top: 0px;
margin-bottom: -3px;
}
@media (min-width: 768px) { @media (min-width: 768px) {
margin-top: 14px; margin-bottom: 0px;
margin-left: 10px; top: 1px;
position: relative; position: relative;
text-align: left;
width: auto;
float: left;
} }
} }
@ -77,10 +72,6 @@ h1{
color: #dc3545; color: #dc3545;
} }
.btn {
margin-top: 5px;
}
.container-xl { .container-xl {
margin-bottom: 40px; margin-bottom: 40px;
} }
@ -129,9 +120,26 @@ h1{
} }
} }
.effective-fee-container{ .effective-fee-container {
display: block; display: block;
@media (min-width: 768px){ @media (min-width: 768px){
display: inline-block; display: inline-block;
} }
} }
.title {
h2 {
line-height: 1;
margin: 0;
padding-bottom: 10px;
}
}
.btn-outline-info {
margin-top: -10px;
@media (min-width: 768px){
display: inline-block;
margin-top: 0px;
}
}

24
frontend/src/app/components/transactions-list/transactions-list.component.scss
View File

@ -4,22 +4,22 @@
} }
.green, .grey, .red { .green, .grey, .red {
font-size: 16px; font-size: 16px;
top: -2px; top: -2px;
position: relative; position: relative;
@media( min-width: 576px){ @media( min-width: 576px){
font-size: 19px; font-size: 19px;
} }
} }
.green { .green {
color:#28a745; color:#28a745;
} }
.red { .red {
color:#dc3545; color:#dc3545;
} }
.grey { .grey {
color:#6c757d; color:#6c757d;
} }
.mobile-bottomcol { .mobile-bottomcol {
@ -43,7 +43,7 @@
} }
} }
.extra-info { .extra-info {
display: none; display: none;
@media (min-width: 576px) { @media (min-width: 576px) {
display: inline-table; display: inline-table;
@ -75,11 +75,11 @@
} }
} }
.fiat { .fiat {
margin-left: 10px; margin-left: 10px;
} }
.tx-page-container { .tx-page-container {
padding: 10px; padding: 10px;
margin-bottom: 10px; margin-bottom: 10px;
margin-top: 10px; margin-top: 10px;
} }
@ -112,6 +112,10 @@
width: 100%; width: 100%;
color: #d43131; color: #d43131;
text-align: right; text-align: right;
margin-top: 0px; margin-top: 0px;
margin-bottom: 10px; margin-bottom: 10px;
} }
h2 {
line-height: 1;
}

238
frontend/src/styles.scss
View File

@ -199,6 +199,21 @@ body {
justify-content: space-between; justify-content: space-between;
} }
.title-address, .title-asset {
color: #FFF;
padding-bottom: 10px;
display: flex;
flex-direction: column;
margin-bottom: 7px;
@media (min-width: 576px) {
flex-direction: row;
margin-bottom: 0px;
}
h1 {
line-height: 1;
}
}
.smaller-text { .smaller-text {
font-size: 14px; font-size: 14px;
} }
@ -288,7 +303,7 @@ html:lang(ru) .card-title {
left: -1px; left: -1px;
position: relative; position: relative;
} }
&:nth-child(4){ &:nth-child(4) {
display: none; display: none;
} }
} }
@ -379,10 +394,10 @@ html:lang(ru) .card-title {
left: -1px; left: -1px;
position: relative; position: relative;
} }
&:nth-child(4){ &:nth-child(4) {
display: none; display: none;
} }
&:nth-child(5){ &:nth-child(5) {
display: none; display: none;
} }
} }
@ -457,10 +472,10 @@ html:lang(ru) .card-title {
thead { thead {
th { th {
&:nth-child(4){ &:nth-child(4) {
display: table-cell; display: table-cell;
} }
&:nth-child(5){ &:nth-child(5) {
display: table-cell; display: table-cell;
} }
} }
@ -652,7 +667,7 @@ h1, h2, h3 {
} }
} }
.flex{ .flex {
display: flex; display: flex;
} }
@ -673,125 +688,124 @@ th {
.reserved { color: #ff8c00 } .reserved { color: #ff8c00 }
.rtl-layout { .rtl-layout {
.fa-arrow-alt-circle-right { .fa-arrow-alt-circle-right {
@extend .fa-arrow-alt-circle-right; @extend .fa-arrow-alt-circle-right;
-webkit-transform: scaleX(-1); -webkit-transform: scaleX(-1);
transform: scaleX(-1); transform: scaleX(-1);
} }
.table td { .table td {
text-align: right; text-align: right;
.fiat { .fiat {
@extend .fiat; @extend .fiat;
margin-left: 0px !important; margin-left: 0px !important;
margin-right: 15px; margin-right: 15px;
}
} }
}
.table th { .table th {
text-align: right; text-align: right;
}
.title-block {
text-align: right;
}
.mr-3 {
@extend .ml-3;
margin-right: 0 !important;
}
.mr-1 {
@extend .ml-1;
}
.float-left {
float: right !important;
}
.float-right {
float: left !important;
}
.text-left {
text-align: right !important;
}
.text-right {
text-align: left !important;
}
.bitcoin-block {
direction: rtl;
}
.next-previous-blocks {
@extend .next-previous-blocks;
direction: ltr;
}
.tx-link {
@extend .tx-link;
margin-left: 0px;
margin-right: 10px;
}
.pagination-container {
@extend .pagination-container;
ul {
@extend ul;
padding-left: 0px;
padding-right: 5px;
} }
}
.title-block { .search-box-container {
text-align: right; @extend .search-box-container;
margin-right: 0 !important;
margin-left: 0.5rem !important;
}
.code {
@extend .code;
text-align: left !important;
direction: ltr;
.subtitle {
@extend .subtitle;
direction: rtl;
text-align: right !important;
} }
}
.mr-3 { .container-graph {
@extend .ml-3; @extend .container-graph;
margin-right: 0 !important; .formRadioGroup {
} @extend .formRadioGroup;
.mr-1 {
@extend .ml-1;
}
.float-left {
float: right !important;
}
.float-right {
float: left !important;
}
.text-left {
text-align: right !important;
}
.text-right {
text-align: left !important;
}
.bitcoin-block {
direction: rtl;
}
.next-previous-blocks {
@extend .next-previous-blocks;
direction: ltr; direction: ltr;
} }
}
.tx-link { .mempool-graph {
@extend .tx-link; @extend .mempool-graph;
margin-left: 0px; direction: ltr;
}
.title-block {
.title {
float: right;
}
}
.container-buttons {
float: left !important;
width: auto !important;
}
.tx-link {
margin-right: 0px;
@media (min-width: 768px) {
margin-right: 10px; margin-right: 10px;
} }
}
.pagination-container {
@extend .pagination-container;
ul {
@extend ul;
padding-left: 0px;
padding-right: 5px;
}
}
.search-box-container {
@extend .search-box-container;
margin-right: 0 !important;
margin-left: 0.5rem !important;
}
.code {
@extend .code;
text-align: left !important;
direction: ltr;
.subtitle {
@extend .subtitle;
direction: rtl;
text-align: right !important;
}
}
.container-graph {
@extend .container-graph;
.formRadioGroup {
@extend .formRadioGroup;
direction: ltr;
}
}
.mempool-graph {
@extend .mempool-graph;
direction: ltr;
}
.title-block {
.title {
float: right;
}
}
.container-buttons {
float: left !important;
width: auto !important;
}
.tx-link {
margin-right: 0px;
@media (min-width: 768px) {
margin-right: 10px;
}
}
} }
.scriptmessage { .scriptmessage {
overflow: hidden; overflow: hidden;
display: inline-block; display: inline-block;
@ -868,7 +882,7 @@ th {
padding: 0; padding: 0;
} }
.collapsed{ .collapsed {
background-color: #2d3348; background-color: #2d3348;
color: #1bd8f4; color: #1bd8f4;
} }