New concept for dashboard layout components. (#469)

* New concept for dashboard layout components. * Align dashboard componentes. * Add divider to fee box component. * Remove TV icon from mobile and tablet queries. * Fix form input overflow. * Add responsive css to statistic component. * Add responsive css to about page. * Add global padding bottom. * Fix graph page styles. * Add responsive chart and scrollable table. * Fix mobile css query for navbar menus. * Fix pagination responsive css. * Add CSS animated logo. * Revert "Add CSS animated logo." This reverts commit 92af38294c0d4fe815a801b37635cde7f8ee1ced. * Add extra skeleton to fee-box-component. * Fix latest-blocks and latest-transactions table css. * Adapt Bisq pages to responsive layout. * Remove parenthesis from fiat amout. Fiat prive break not break on desktop. Transaction ID align left. Fee box skeleton width resize. * Fix mobile table text-size. * Fix dashboard mempool info mobile alignment.
2021-05-03 10:11:30 -03:00
parent fd7f715ed1
commit e3e53f62e1
50 changed files with 1485 additions and 416 deletions
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -313,20 +313,21 @@

    <br><br>
    <br><br>
+    <div class="alliances">
+      <h3 i18n="about.alliances">Community Alliances</h3>

-    <h3 i18n="about.alliances">Community Alliances</h3>
+      <a href="https://liquid.net/">
+        <img src="/resources/profile/liquid.svg" height="52">
+      </a>

-    <a href="https://liquid.net/">
-      <img src="/resources/profile/liquid.svg" height="52">
-    </a>
+      <a href="https://opencrypto.org/">
+        <img src="/resources/profile/copa.png" height="62">
+      </a>

-    <a href="https://opencrypto.org/">
-      <img src="/resources/profile/copa.png" height="62" style="margin-left: 30px; margin-right: 30px; margin-top: 20px;">
-    </a>
-
-    <a href="https://bisq.network/">
-      <img src="/resources/profile/bisq.svg" height="62">
-    </a>
+      <a href="https://bisq.network/">
+        <img src="/resources/profile/bisq.svg" height="62">
+      </a>
+    </div>

    <br><br>
    <br><br>
--- a/frontend/src/app/components/about/about.component.scss
+++ b/frontend/src/app/components/about/about.component.scss
@@ -48,3 +48,25 @@
  color: #FF0000;
  font-weight: bold;
 }
+
+.alliances {
+  a {    
+    &:nth-child(3){
+      position: relative;
+      top: 10px;
+    }
+  }
+  img {
+    display: inline-block;
+    margin: 15px auto;
+    @media (min-width: 425px) {
+      margin: 15px 60px;
+    }
+    @media (min-width: 576px) {
+      margin: 15px 120px;
+    }
+    @media (min-width: 850px) {
+      margin: 50px 30px 0px;
+    }
+  }
+}
--- a/frontend/src/app/components/address/address.component.html
+++ b/frontend/src/app/components/address/address.component.html
@@ -1,10 +1,12 @@
 <div class="container-xl">
-  <h1 class="float-left" i18n="shared.address">Address</h1>
-  <a [routerLink]="['/address/' | relativeUrl, addressString]" style="line-height: 56px; margin-left: 10px;">
-    <span class="d-inline d-lg-none">{{ addressString | shortenString : 18 }}</span>
-    <span class="d-none d-lg-inline">{{ addressString }}</span>
-  </a>
-  <app-clipboard [text]="addressString"></app-clipboard>
+  <h1 i18n="shared.address">Address</h1>
+  <div class="tx-link">
+    <a [routerLink]="['/address/' | relativeUrl, addressString]" >
+      <span class="d-inline d-lg-none">{{ addressString | shortenString : 18 }}</span>
+      <span class="d-none d-lg-inline">{{ addressString }}</span>
+    </a>
+    <app-clipboard [text]="addressString"></app-clipboard>
+  </div>
  <br>

  <div class="clearfix"></div>
@@ -13,7 +15,7 @@
    <div class="box">

      <div class="row">
-        <div class="col">
+        <div class="col-md">
          <table class="table table-borderless table-striped">
            <tbody>
              <ng-template [ngIf]="!address.electrum">
@@ -28,13 +30,13 @@
              </ng-template>
              <tr>
                <td i18n="address.balance">Balance</td>
-                <td *ngIf="address.chain_stats.funded_txo_sum !== undefined; else confidentialTd"><app-amount [satoshis]="receieved - sent" [noFiat]="true"></app-amount> (<app-fiat [value]="receieved - sent"></app-fiat>)</td>
+                <td *ngIf="address.chain_stats.funded_txo_sum !== undefined; else confidentialTd"><app-amount [satoshis]="receieved - sent" [noFiat]="true"></app-amount> <span class="fiat"><app-fiat [value]="receieved - sent"></app-fiat></span></td>
              </tr>
            </tbody>
          </table>
        </div>
        <div class="w-100 d-block d-md-none"></div>
-        <div class="col qrcode-col">
+        <div class="col-md qrcode-col">
          <div class="qr-wrapper">
            <app-qrcode [data]="address.address"></app-qrcode>
          </div>
--- a/frontend/src/app/components/address/address.component.scss
+++ b/frontend/src/app/components/address/address.component.scss
@@ -3,21 +3,94 @@
  padding: 10px;
  padding-bottom: 5px;
  display: inline-block;
-  margin-right: 25px;
 }

-@media (min-width: 576px) {
-  .qrcode-col {
-    text-align: right;
+.qrcode-col {
+  margin: 20px auto 10px;
+  text-align: center;
+  @media (min-width: 992px){
+    margin: 0px auto 0px;
  }
 }
-@media (max-width: 575.98px) {
-  .qrcode-col {
-    text-align: center;
-  }

-  .qrcode-col > div {
-    margin-top: 20px;
-    margin-right: 0px;
+.fiat {
+  display: block;
+  @media (min-width: 992px){
+    display: inline-block;
+    margin-left: 10px;
+  }
+}
+
+.table {
+  tr td {
+    &:last-child {
+      text-align: right;
+      @media (min-width: 576px) {
+        text-align: left;
+      }
+    }
+  }
+}
+
+h1 {
+  margin: 0px;
+  padding: 0px;
+  @media (min-width: 576px) {
+    float: left;
+    margin-right: 10px;
+  }
+}
+
+.address-link {
+  line-height: 56px; 
+  margin-left: 0px;
+  top: -2px;
+  position: relative;  
+  @media (min-width: 768px) {
+    line-height: 69px;
+  }
+}
+
+.row{
+	flex-direction: column;
+	@media (min-width: 576px) {
+		flex-direction: row;
+	}
+}
+
+.scriptmessage {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	vertical-align: middle;
+	max-width: 50px;
+	@media (min-width: 576px) {
+		max-width: 200px;
+	}
+}
+
+.scriptmessage.longer {
+	max-width: 500px;
+}
+
+@media (max-width: 767.98px) {
+	.mobile-bottomcol {
+		margin-top: 15px;
+	}
+	.scriptmessage.longer {
+		max-width: 200px !important;
+	}
+
+	.details-table td:first-child {
+		white-space: pre-wrap;
+	}
+}
+
+.tx-link {
+  display: block;
+  width: 100%;
+  top: 14px;
+  position: relative;
+  @media (min-width: 768px) {
+    top: 20px;
  }
 }
--- a/frontend/src/app/components/amount/amount.component.html
+++ b/frontend/src/app/components/amount/amount.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="!noFiat && (viewFiat$ | async) && (conversions$ | async) as conversions; else viewFiatVin">
-  <span>{{ conversions.USD * (satoshis / 100000000) | currency:'USD':'symbol':'1.2-2' }}</span>
+  <span class="fiat">{{ conversions.USD * (satoshis / 100000000) | currency:'USD':'symbol':'1.2-2' }}</span>
 </ng-container>
 <ng-template #viewFiatVin>
  <ng-template [ngIf]="network === 'liquid' && (satoshis === undefined || satoshis === null)" [ngIfElse]="default">
@@ -7,8 +7,8 @@
  </ng-template>
  <ng-template #default>
    &lrm;{{ satoshis / 100000000 | number : digitsInfo }}
-    <ng-template [ngIf]="network === 'liquid'">L-</ng-template>
+    <span class="symbol"><ng-template [ngIf]="network === 'liquid'">L-</ng-template>
    <ng-template [ngIf]="network === 'testnet'">t</ng-template>
-    <ng-template [ngIf]="network === 'signet'">s</ng-template>BTC
+    <ng-template [ngIf]="network === 'signet'">s</ng-template>BTC</span>
  </ng-template>
 </ng-template>
--- a/frontend/src/app/components/amount/amount.component.scss
+++ b/frontend/src/app/components/amount/amount.component.scss
@@ -1,3 +1,3 @@
 .green-color {
  color: #3bcc49;
-}
+}
--- a/frontend/src/app/components/block/block.component.html
+++ b/frontend/src/app/components/block/block.component.html
@@ -1,8 +1,8 @@
 <div class="container-xl">

  <div class="title-block">
-    <h1 class="float-left"><ng-template [ngIf]="blockHeight === 0" i18n="block.genesis">Genesis </ng-template><ng-template [ngIf]="blockHeight" i18n="block.block">Block <a [routerLink]="['/block/' | relativeUrl, blockHash]">{{ blockHeight }}</a></ng-template></h1>
-    <button [routerLink]="['/' | relativeUrl]" class="btn btn-sm float-right mr-2 mt-2">&#10005;</button>
+    <h1><ng-template [ngIf]="blockHeight === 0" i18n="block.genesis">Genesis </ng-template><ng-template [ngIf]="blockHeight" i18n="block.block">Block <a [routerLink]="['/block/' | relativeUrl, blockHash]">{{ blockHeight }}</a></ng-template></h1>
+    <button [routerLink]="['/' | relativeUrl]" class="btn btn-sm">&#10005;</button>
  </div>

  <div class="clearfix"></div>
@@ -43,12 +43,12 @@
            <tbody>
              <tr *ngIf="block.medianFee !== undefined">
                <td class="td-width" i18n="block.median-fee">Median fee</td>
-                <td>~{{ block.medianFee | number:'1.0-0' }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span> (<app-fiat [value]="block.medianFee * 140" digitsInfo="1.2-2" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom"></app-fiat>)</td>
+                <td>~{{ block.medianFee | number:'1.0-0' }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span> <span class="fiat"><app-fiat [value]="block.medianFee * 140" digitsInfo="1.2-2" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom"></app-fiat></span></td>
              </tr>
              <ng-template [ngIf]="fees !== undefined" [ngIfElse]="loadingFees">
                <tr>
                  <td i18n="block.total-fees|Total fees in a block">Total fees</td>
-                  <td *ngIf="network !== 'liquid'; else liquidTotalFees"><app-amount [satoshis]="fees * 100000000" digitsInfo="1.2-2" [noFiat]="true"></app-amount> (<app-fiat [value]="fees * 100000000" digitsInfo="1.0-0"></app-fiat>)</td>
+                  <td *ngIf="network !== 'liquid'; else liquidTotalFees"><app-amount [satoshis]="fees * 100000000" digitsInfo="1.2-2" [noFiat]="true"></app-amount> <span class="fiat"><app-fiat [value]="fees * 100000000" digitsInfo="1.0-0"></app-fiat></span></td>
                  <ng-template #liquidTotalFees>
                    <td>{{ fees * 100000000 | number }} L-sat (<app-fiat [value]="fees * 100000000" digitsInfo="1.2-2"></app-fiat>)</td>
                  </ng-template>
@@ -56,7 +56,7 @@
                <tr *ngIf="network !== 'liquid'">
                  <td i18n="block.subsidy-and-fees|Total subsidy and fees in a block">Subsidy + fees:</td>
                  <td>
-                    <app-amount [satoshis]="(blockSubsidy + fees) * 100000000" digitsInfo="1.2-2" [noFiat]="true"></app-amount> (<app-fiat [value]="(blockSubsidy + fees) * 100000000" digitsInfo="1.0-0"></app-fiat>)
+                    <app-amount [satoshis]="(blockSubsidy + fees) * 100000000" digitsInfo="1.2-2" [noFiat]="true"></app-amount> <span class="fiat"><app-fiat [value]="(blockSubsidy + fees) * 100000000" digitsInfo="1.0-0"></app-fiat></span>
                  </td>
                </tr>
              </ng-template>
--- a/frontend/src/app/components/block/block.component.scss
+++ b/frontend/src/app/components/block/block.component.scss
@@ -1,22 +1,93 @@
-.title-block {
-  color: #FFF;
-  padding-top: 20px;
-  padding-bottom: 3px;
-  border-top: 3px solid #FFF;
+.qr-wrapper {
+  background-color: #FFF;
+  padding: 10px;
+  padding-bottom: 5px;
+  display: inline-block;
 }

-.td-width {
-  width: 175px;
+.qrcode-col {
+  text-align: center;
 }

-@media (max-width: 767.98px) {
-	.td-width {
-		width: 140px;
+.qrcode-col > div {
+  margin: 20px auto 5px;
+  @media (min-width: 768px) {
+    text-align: center;
+    margin: auto;
+  }
+}
+
+.fiat {
+  display: block;    
+  font-size: 13px;
+  @media (min-width: 768px) {
+    font-size: 14px;
+    display: inline-block;
+    margin-left: 10px;
+  }
+}
+.table {
+  tr td {
+    &:last-child {
+      text-align: right;
+      @media (min-width: 768px) {
+        text-align: left;
+      }
+    }
+  }
+}
+
+h1 {
+  margin: 0px;
+  padding: 0px;
+  @media (min-width: 576px) {
+    float: left;
+    margin-right: 10px;
+  }
+}
+
+.address-link {
+  line-height: 26px;
+  margin-left: 0px;
+  top: 14px;
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  @media (min-width: 768px) {
+    line-height: 38px;
+  }
+}
+
+.row{
+	flex-direction: column;
+	@media (min-width: 768px) {
+		flex-direction: row;
 	}
 }

+.scriptmessage {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	vertical-align: middle;
+	max-width: 50px;
+	@media (min-width: 576px) {
+		max-width: 200px;
+	}
+}

-.break-all {
-  white-space: normal;
-  word-break: break-all;
+.scriptmessage.longer {
+	max-width: 500px;
+}
+
+@media (max-width: 767.98px) {
+	.mobile-bottomcol {
+		margin-top: 15px;
+	}
+	.scriptmessage.longer {
+		max-width: 200px !important;
+	}
+
+	.details-table td:first-child {
+		white-space: pre-wrap;
+	}
 }
--- a/frontend/src/app/components/fees-box/fees-box.component.html
+++ b/frontend/src/app/components/fees-box/fees-box.component.html
@@ -1,39 +1,48 @@
-<table style="width: 100%;">
-  <tr *ngIf="(isLoadingWebSocket$ | async) === false && (feeEstimations$ | async) as feeEstimations; else loadingFees">
-    <td class="d-none d-md-table-cell" style="width: 33%;">
+<div class="fee-estimation-wrapper">
+  <div class="fee-estimation-container" *ngIf="(isLoadingWebSocket$ | async) === false && (feeEstimations$ | async) as feeEstimations; else loadingFees">
+    <div class="item">
      <h5 class="card-title" i18n="fees-box.low-priority">Low priority</h5>
-      <p class="card-text">
-        {{ feeEstimations.hourFee }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span> (<app-fiat [value]="feeEstimations.hourFee * 140" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom"></app-fiat>)
-      </p>
-    </td>
-    <td style="width: 33%;">
+      <div class="card-text">
+        <div class="fee-text">{{ feeEstimations.hourFee }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span></div> <span class="fiat"><app-fiat [value]="feeEstimations.hourFee * 140" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom"></app-fiat></span>
+      </div>
+    </div>
+    <div class="item">
      <h5 class="card-title" i18n="fees-box.medium-priority">Medium priority</h5>
-      <p class="card-text">
-        {{ feeEstimations.halfHourFee }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span> (<app-fiat [value]="feeEstimations.halfHourFee * 140" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom"></app-fiat>)
-      </p>
-    </td>
-    <td style="width: 33%;">
+      <div class="card-text">
+        <div class="fee-text">{{ feeEstimations.halfHourFee }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span></div> <span class="fiat"><app-fiat [value]="feeEstimations.halfHourFee * 140" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom"></app-fiat></span>
+      </div>
+    </div>
+    <div class="item">
      <h5 class="card-title" i18n="fees-box.high-priority">High priority</h5>
-      <p class="card-text">
-        {{ feeEstimations.fastestFee }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span> (<app-fiat [value]="feeEstimations.fastestFee * 140" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom"></app-fiat>)
-      </p>
-    </td>
-  </tr>
-</table>
+      <div class="card-text">
+        <div class="fee-text">{{ feeEstimations.fastestFee }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span></div> <span class="fiat"><app-fiat [value]="feeEstimations.fastestFee * 140" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom"></app-fiat></span>
+      </div>
+    </div>
+  </div>
+</div>

 <ng-template #loadingFees>
-  <tr>
-    <td class="d-none d-md-table-cell" style="width: 33%;">
+  <div class="fee-estimation-container loading-container">
+    <div class="item">
      <h5 class="card-title" i18n="fees-box.low-priority">Low priority</h5>
-      <p class="card-text"><span class="skeleton-loader"></span></p>
-    </td>
-    <td style="width: 33%;">
+      <div class="card-text">
+        <div class="skeleton-loader"></div>
+        <div class="skeleton-loader"></div>
+      </div>
+    </div>
+    <div class="item">
      <h5 class="card-title" i18n="fees-box.medium-priority">Medium priority</h5>
-      <p class="card-text"><span class="skeleton-loader" style="width: 80%;"></span></p>
-    </td>
-    <td style="width: 33%;">
+      <div class="card-text">
+        <div class="skeleton-loader"></div>
+        <div class="skeleton-loader"></div>
+      </div>
+    </div>
+    <div class="item">
      <h5 class="card-title" i18n="fees-box.high-priority">High priority</h5>
-      <p class="card-text"><span class="skeleton-loader"></span></p>
-    </td>
-  </tr>
+      <div class="card-text">
+        <div class="skeleton-loader"></div>
+        <div class="skeleton-loader"></div>
+      </div>
+    </div>
+  </div>
 </ng-template>
--- a/frontend/src/app/components/fees-box/fees-box.component.scss
+++ b/frontend/src/app/components/fees-box/fees-box.component.scss
@@ -1,3 +1,84 @@
 .card-title {
  color: #4a68b9;
+  font-size: 10px;
+  margin-bottom: 4px;  
+  font-size: 1rem;
 }
+
+.card-text {
+  font-size: 22px;
+  span {
+    font-size: 11px;
+    position: relative;
+    top: -2px;
+    display: inline-flex;
+  }
+  .green-color {
+    display: block;
+  }
+}
+
+.fee-estimation-container {
+  display: flex;
+  justify-content: space-between;
+  @media (min-width: 376px) {
+    flex-direction: row;
+  }  
+  .item {
+    max-width: 150px;
+    margin: 0;
+    width: -webkit-fill-available;
+    @media (min-width: 376px) {
+      margin: 0 auto 0px;
+    }    
+    &:first-child{
+      display: none;
+      @media (min-width: 485px) {
+        display: block;
+      }    
+      @media (min-width: 768px) {
+        display: none;
+      }    
+      @media (min-width: 992px) {
+        display: block;
+      }    
+    }
+    &:last-child {
+      margin-bottom: 0;
+    }
+    .card-text span {
+      color: #ffffff66;
+      font-size: 12px;
+      top: 0px;
+    }
+    .fee-text{
+      border-bottom: 1px solid #ffffff1c;
+      width: fit-content;
+      margin: auto;
+      line-height: 1.45;
+      padding: 0px 2px;
+    }
+    .fiat {
+      display: block;
+      font-size: 14px !important;
+    }
+  }
+}
+
+.loading-container{
+  min-height: 76px;
+}
+
+.card-text {
+  .skeleton-loader {
+    width: 100%;
+    display: block;
+    margin: 9px auto;
+    &:first-child {
+      max-width: 90px;
+    }
+    &:last-child {
+      max-width: 55px;
+    }
+  }
+}
--- a/frontend/src/app/components/master-page/master-page.component.html
+++ b/frontend/src/app/components/master-page/master-page.component.html
@@ -48,7 +48,7 @@
        <li class="nav-item" routerLinkActive="active">
          <a class="nav-link" [routerLink]="['/graphs' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'chart-area']" [fixedWidth]="true" i18n-title="master-page.graphs" title="Graphs"></fa-icon></a>
        </li>
-        <li class="nav-item d-none d-sm-block" routerLinkActive="active">
+        <li class="nav-item d-none d-lg-block" routerLinkActive="active">
          <a class="nav-link" [routerLink]="['/tv' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'tv']" [fixedWidth]="true" i18n-title="master-page.tvview" title="TV view"></fa-icon></a>
        </li>
      </ng-template>
--- a/frontend/src/app/components/master-page/master-page.component.scss
+++ b/frontend/src/app/components/master-page/master-page.component.scss
@@ -42,17 +42,21 @@ li.nav-item {
  justify-content: center;
  position: fixed;
  width: 100%;
-}
-
-@media (min-width: 992px) {
-  .navbar-nav {
+  @media (min-width: 992px) {
    background: transparent;
    box-shadow: none;
    position: relative;
    width: auto;
  }
+  a {
+    font-size: 0.8em;
+    @media (min-width: 375px) {
+      font-size: 1em;
+    }
+  }
 }

+
 .navbar-collapse {
  flex-basis: auto;
  justify-content: flex-end;
--- a/frontend/src/app/components/mempool-block/mempool-block.component.html
+++ b/frontend/src/app/components/mempool-block/mempool-block.component.html
@@ -2,7 +2,7 @@

  <div class="title-block">
    <h1 class="float-left">{{ ordinal$ | async }}</h1>
-    <button [routerLink]="['/' | relativeUrl]" class="btn btn-sm float-right mr-2 mt-2">&#10005;</button>
+    <button [routerLink]="['/' | relativeUrl]" class="btn btn-sm float-right">&#10005;</button>
  </div>

  <div class="clearfix"></div>
@@ -14,15 +14,15 @@
          <tbody>
            <tr>
              <td i18n="mempool-block.median-fee">Median fee</td>
-              <td>~{{ mempoolBlock.medianFee | number:'1.0-0' }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span> (<app-fiat [value]="mempoolBlock.medianFee * 140" digitsInfo="1.2-2" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom"></app-fiat>)</td>
+              <td>~{{ mempoolBlock.medianFee | number:'1.0-0' }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span> <span class="fiat"><app-fiat [value]="mempoolBlock.medianFee * 140" digitsInfo="1.2-2" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom"></app-fiat></span></td>
            </tr>
            <tr>
              <td i18n="mempool-block.fee-span">Fee span</td>
-              <td><span class="yellow-color">{{ mempoolBlock.feeRange[0] | number:'1.0-0' }} - {{ mempoolBlock.feeRange[mempoolBlock.feeRange.length - 1] | number:'1.0-0' }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span></span></td>
+              <td><span class="yellow-color">{{ mempoolBlock.feeRange[0] | number:'1.0-0' }} - {{ mempoolBlock.feeRange[mempoolBlock.feeRange.length - 1] | number:'1.0-0' }} <span class="symbol yellow-color" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></span></td>
            </tr>
            <tr>
              <td i18n="mempool-block.total-fees">Total fees</td>
-              <td><app-amount [satoshis]="mempoolBlock.totalFees" [digitsInfo]="'1.2-2'" [noFiat]="true"></app-amount> (<app-fiat [value]="mempoolBlock.totalFees" digitsInfo="1.0-0"></app-fiat>)</td>
+              <td><app-amount [satoshis]="mempoolBlock.totalFees" [digitsInfo]="'1.2-2'" [noFiat]="true"></app-amount> <span class="fiat"><app-fiat [value]="mempoolBlock.totalFees" digitsInfo="1.0-0"></app-fiat></span></td>
            </tr>
            <tr>
              <td i18n="mempool-block.transactions">Transactions</td>
--- a/frontend/src/app/components/mempool-block/mempool-block.component.scss
+++ b/frontend/src/app/components/mempool-block/mempool-block.component.scss
@@ -1,5 +1,7 @@
 .progress {
  background-color: #2d3348;
+  position: relative;
+  top: 5px;
 }

 .title-block {
@@ -7,4 +9,33 @@
  padding-top: 20px;
  padding-bottom: 3px;
  border-top: 3px solid #FFF;
+}
+
+.fiat {
+  font-size: 13px;
+  display: block;
+  @media (min-width: 992px) {
+    display: inline-block;
+    margin-left: 10px;
+  }
+}
+
+.table {
+  tr td {
+    &:last-child{
+      text-align: right;
+      @media (min-width: 992px) {
+        text-align: left;
+      }
+    }
+  }
+}
+
+h1 {
+  margin: 0px;
+  padding: 0px;
+  @media (min-width: 576px) {
+    float: left;
+    margin-right: 10px;
+  }
 }
--- a/frontend/src/app/components/search-form/search-form.component.scss
+++ b/frontend/src/app/components/search-form/search-form.component.scss
@@ -7,17 +7,11 @@

 form {
  margin-top: 5px;
-}
-
-@media (min-width: 576px) {
-  form {
+  @media (min-width: 576px) {
    margin-top: 0px;
    margin-left: 8px;
-  }
-}
-
-@media (min-width: 992px) {
-  form {
+  }  
+  @media (min-width: 992px) {
    width: 100%;
  }
 }
@@ -28,30 +22,19 @@ form {

 .search-box-container {
  width: 100%;
-}
-
-.search-box-container input {
-  border: 0px;
-}
-
-.search-box-container .btn {
-  width: 100px;
-}
-
-@media (min-width: 768px) {
-  .search-box-container {
+  @media (min-width: 768px) {
    min-width: 400px;
  }
-}
-
-@media (min-width: 992px) {
-  .search-box-container {
-    min-width: 260px;
+  @media (min-width: 992px) {
+    min-width: 200px;
  }
-}
-
-@media (min-width: 1200px) {
-  .search-box-container {
+  @media (min-width: 1200px) {
    min-width: 300px;
  }
-}
+  input {
+    border: 0px;
+  }
+  .btn {
+    width: 100px;
+  }
+}
--- a/frontend/src/app/components/statistics/chartist.component.scss
+++ b/frontend/src/app/components/statistics/chartist.component.scss
@@ -0,0 +1,6 @@
+.ct-legend{
+    top: 130px;
+    @media (min-width: 653px) {
+        top: 90px;
+    }
+}
--- a/frontend/src/app/components/statistics/statistics.component.html
+++ b/frontend/src/app/components/statistics/statistics.component.html
@@ -1,21 +1,17 @@
-<div class="container-xl" style="max-width: 100%;">
-
-  <div class="row">
-    <div class="col-lg-12" *ngIf="loading">
+<div class="container-graph">
+  <div>
+    <div *ngIf="loading">
      <div class="text-center">
        <h3 i18n="statistics.loading-graphs">Loading graphs...</h3>
        <br>
        <div class="spinner-border text-light"></div>
      </div>
    </div>
-
-    <div class="col-lg-12">
-
+    <div>
      <div class="card mb-3" *ngIf="mempoolStats.length">
        <div class="card-header">
          <i class="fa fa-area-chart"></i> <span i18n="statistics.memory-by-vBytes">Mempool by vBytes (sat/vByte)</span>
-
-          <form [formGroup]="radioGroupForm" style="float: right;" (click)="saveGraphPreference()">
+          <form [formGroup]="radioGroupForm" class="formRadioGroup" (click)="saveGraphPreference()">
            <div class="spinner-border text-light bootstrap-spinner" *ngIf="spinnerLoading"></div>
            <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan">
              <label ngbButtonLabel class="btn-primary btn-sm">
@@ -64,11 +60,8 @@
              [options]="transactionsWeightPerSecondOptions">
            </app-chartist>
          </div>
-  
        </div>
      </div>
    </div>
-
  </div>
-
 </div>
--- a/frontend/src/app/components/statistics/statistics.component.scss
+++ b/frontend/src/app/components/statistics/statistics.component.scss
@@ -1,7 +1,13 @@
+.container-graph {
+  padding: 0px 15px;
+}
+
 .card-header {
  border-bottom: 0;
-  background-color: none;
-  font-size: 20px;
+  font-size: 18px;
+  @media (min-width: 465px) {
+    font-size: 20px;
+  }
 }

 .card {
@@ -15,12 +21,23 @@
  margin-right: 10px;
 }

-@media (max-width: 767.98px) {
- .container-xl {
-    padding: 0;
-  }
-  .card-body {
+.card-body {
+  @media (max-width: 767.98px) {
    padding-left: 0;
    padding-right: 0;
  }
 }
+
+.formRadioGroup{
+  margin-top: 6px;
+  @media (min-width: 653px) {
+    float: right;
+    margin-top: 0px;
+  }
+  .btn-sm {
+    font-size: 10px;
+    @media (min-width: 768px) {
+      font-size: 14px;
+    }
+  }
+}
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -9,26 +9,29 @@
      </a>
    </div>
  
-    <h1 class="float-left mr-3 mb-md-3" i18n="shared.transaction">Transaction</h1>
+    <h1 i18n="shared.transaction">Transaction</h1>

-    <ng-template [ngIf]="tx?.status?.confirmed">
-      <button *ngIf="latestBlock" type="button" class="btn btn-sm btn-success float-right mr-2 mt-1 mt-md-3">
-        <ng-container *ngTemplateOutlet="latestBlock.height - tx.status.block_height + 1 == 1 ? confirmationSingular : confirmationPlural; context: {$implicit: latestBlock.height - tx.status.block_height + 1}"></ng-container>
-        <ng-template #confirmationSingular let-i i18n="shared.confirmation-count.singular|Transaction singular confirmation count">{{ i }} confirmation</ng-template>
-        <ng-template #confirmationPlural let-i i18n="shared.confirmation-count.plural|Transaction plural confirmation count">{{ i }} confirmations</ng-template>
-      </button>
-    </ng-template>
-    <ng-template [ngIf]="tx && !tx?.status.confirmed">
-      <button type="button" class="btn btn-sm btn-danger float-right mr-2 mt-1 mt-md-3" i18n="transaction.unconfirmed|Transaction unconfirmed state">Unconfirmed</button>
-    </ng-template>
-
-    <div>
-      <a [routerLink]="['/tx/' | relativeUrl, txId]" style="line-height: 56px;">
+    <div class="tx-link">
+      <a [routerLink]="['/tx/' | relativeUrl, txId]">
        <span class="d-inline d-lg-none">{{ txId | shortenString : 24 }}</span>
        <span class="d-none d-lg-inline">{{ txId }}</span>
      </a>
      <app-clipboard [text]="txId"></app-clipboard>
    </div>
+
+    <div class="container-buttons" >
+      <ng-template [ngIf]="tx?.status?.confirmed">
+        <button *ngIf="latestBlock" type="button" class="btn btn-sm btn-success">
+          <ng-container *ngTemplateOutlet="latestBlock.height - tx.status.block_height + 1 == 1 ? confirmationSingular : confirmationPlural; context: {$implicit: latestBlock.height - tx.status.block_height + 1}"></ng-container>
+          <ng-template #confirmationSingular let-i i18n="shared.confirmation-count.singular|Transaction singular confirmation count">{{ i }} confirmation</ng-template>
+          <ng-template #confirmationPlural let-i i18n="shared.confirmation-count.plural|Transaction plural confirmation count">{{ i }} confirmations</ng-template>
+        </button>
+      </ng-template>
+      <ng-template [ngIf]="tx && !tx?.status.confirmed">
+        <button type="button" class="btn btn-sm btn-danger" i18n="transaction.unconfirmed|Transaction unconfirmed state">Unconfirmed</button>
+      </ng-template>
+    </div>
+
    <div class="clearfix"></div>
  </div>
  <div class="clearfix"></div>
@@ -163,7 +166,7 @@
                  </a>
                </td>
                <td class="d-none d-lg-table-cell">{{ cpfpInfo.bestDescendant.weight / 4 | vbytes: 2 }}</td>
-                <td>{{ cpfpInfo.bestDescendant.fee / (cpfpInfo.bestDescendant.weight / 4) | number : '1.1-1' }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
+                <td>{{ cpfpInfo.bestDescendant.fee / (cpfpInfo.bestDescendant.weight / 4) | number : '1.1-1' }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
                <td class="d-none d-lg-table-cell"><fa-icon class="arrow-green" [icon]="['fas', 'angle-double-up']" [fixedWidth]="true"></fa-icon></td>
              </tr>
            </ng-template>
@@ -176,7 +179,7 @@
                  </a>
                </td>
                <td class="d-none d-lg-table-cell">{{ cpfpTx.weight / 4 | vbytes: 2 }}</td>
-                <td>{{ cpfpTx.fee / (cpfpTx.weight / 4) | number : '1.1-1' }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
+                <td>{{ cpfpTx.fee / (cpfpTx.weight / 4) | number : '1.1-1' }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
                <td class="d-none d-lg-table-cell"><fa-icon *ngIf="roundToOneDecimal(cpfpTx) < roundToOneDecimal(tx)" class="arrow-red" [icon]="['fas', 'angle-double-down']" [fixedWidth]="true"></fa-icon></td>
              </tr>
            </ng-template>
@@ -324,12 +327,12 @@
    <tbody>
      <tr>
        <td class="td-width" i18n="transaction.fee|Transaction fee">Fee</td>
-        <td>{{ tx.fee | number }} <span i18n="transaction.fee.sat|Transaction Fee sat">sat</span> (<app-fiat [value]="tx.fee"></app-fiat>)</td>
+        <td>{{ tx.fee | number }} <span class="symbol" i18n="transaction.fee.sat|Transaction Fee sat">sat</span> <span class="fiat"><app-fiat [value]="tx.fee"></app-fiat></span></td>
      </tr>
      <tr>
        <td i18n="transaction.fee-rate|Transaction fee rate">Fee rate</td>
        <td>
-          {{ tx.feePerVsize | number : '1.1-1' }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span>
+          {{ tx.feePerVsize | number : '1.1-1' }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span>
          <ng-template [ngIf]="tx.status.confirmed">
            &nbsp;
            <app-tx-fee-rating *ngIf="tx.fee && (cpfpInfo && !cpfpInfo.bestDescendant && !cpfpInfo.ancestors.length)" [tx]="tx"></app-tx-fee-rating>
@@ -339,7 +342,7 @@
      <tr *ngIf="cpfpInfo && (cpfpInfo.bestDescendant || cpfpInfo.ancestors.length)">
        <td i18n="transaction.effective-fee-rate|Effective transaction fee rate">Effective fee rate</td>
        <td>
-          {{ tx.effectiveFeePerVsize | number : '1.1-1' }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span>
+          {{ tx.effectiveFeePerVsize | number : '1.1-1' }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span>
          <ng-template [ngIf]="tx.status.confirmed">
            <app-tx-fee-rating class="d-none d-lg-inline ml-2" *ngIf="tx.fee" [tx]="tx"></app-tx-fee-rating>
          </ng-template>
--- a/frontend/src/app/components/transaction/transaction.component.scss
+++ b/frontend/src/app/components/transaction/transaction.component.scss
@@ -6,8 +6,49 @@
  color: #FFF;
  padding-top: 20px;
  border-top: 3px solid #FFF;
+  width: 100%;
+  padding-bottom: 30px;
+  @media (min-width: 768px) {
+  	padding-bottom: 0px;
+  }
 }

+
+h1{
+	font-size: 1.75rem;
+    margin-top: 2px;
+	margin-bottom: 0;
+	float: left;
+	@media (min-width: 375px){
+		margin-top: 0px;
+		font-size: 2rem;
+	}
+}
+
+.container-buttons {
+	text-align: right;
+    width: 100%;
+	@media (min-width: 992px) {
+		width: 300px;
+	}
+}
+
+.tx-link {
+	display: block;
+	width: auto;
+	margin-bottom: 10px;
+    margin-left: 2px;
+	margin-top: 40px;
+    position: absolute;
+	@media (min-width: 768px) {
+	  margin-top: 14px;
+	  margin-left: 10px;
+	  position: relative;	  
+	  text-align: left;
+	  width: 100%;
+	}
+  }
+
@media (max-width: 767.98px) {
 	.mobile-bottomcol {
 		margin-top: 15px;
@@ -15,19 +56,13 @@
 }

 .td-width {
-  width: 175px;
-}
+	width: 150px;

-@media (max-width: 767.98px) {
-	.td-width {
-		width: 150px;
+	@media (max-width: 768px) {
+	  width: 175px;
 	}
 }

-h1 {
-	margin-bottom: 0;
-}
-
 .badge {
 	position: relative;
 	top: -1px;
@@ -43,4 +78,75 @@ h1 {

 .arrow-red {
 	color: #dc3545;
-}
+}
+
+.btn {
+	// float: right;
+	// margin-bottom: 0px;
+	margin-top: 5px;
+}
+
+.container-xl {
+	margin-bottom: 40px;
+}
+
+.row{
+	flex-direction: column;
+	@media (min-width: 850px) {
+		flex-direction: row;
+	}
+}
+
+.scriptmessage {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	vertical-align: middle;
+	max-width: 50px;
+	@media (min-width: 576px) {
+		max-width: 200px;
+	}
+}
+
+.scriptmessage.longer {
+	max-width: 500px;
+}
+
+@media (max-width: 767.98px) {
+	.mobile-bottomcol {
+		margin-top: 15px;
+	}
+	.scriptmessage.longer {
+		max-width: 200px !important;
+	}
+
+	.details-table td:first-child {
+		white-space: pre-wrap;
+	}
+}
+
+.fiat {
+	display: block;
+	@media (min-width: 768px){
+		display: inline-block;
+		margin-left: 15px;
+		text-align: left;
+	}
+}
+
+.table {
+  	tr td {
+		&:last-child {
+			text-align: right;
+			@media (min-width: 768px) {
+			text-align: left;
+			}
+		}
+		.btn {
+			display: block;
+		}
+	}
+}
+// .container-buttons{
+// 	width: 100%;
+// 	display: inline-block;
+// }
--- a/frontend/src/app/components/transactions-list/transactions-list.component.html
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.html
@@ -198,7 +198,7 @@

    <div>
      <div class="float-left mt-2-5" *ngIf="!transactionPage && tx.fee">
-        {{ tx.fee / (tx.weight / 4) | number : '1.1-1' }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span> <span class="d-none d-sm-inline-block">&nbsp;&ndash; {{ tx.fee | number }} <span i18n="shared.sat|sat">sat</span> (<app-fiat [value]="tx.fee"></app-fiat>)</span>
+        {{ tx.fee / (tx.weight / 4) | number : '1.1-1' }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span> <span class="d-none d-sm-inline-block">&nbsp;&ndash; {{ tx.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span> <span class="fiat"><app-fiat [value]="tx.fee"></app-fiat></span></span>
      </div>

      <div class="float-right">
--- a/frontend/src/app/components/transactions-list/transactions-list.component.scss
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.scss
@@ -19,9 +19,9 @@
 	left: 0;
 	right: calc(-1*30px/3);
 	width: 0;
-  height: 0;
+  	height: 0;
 	border-top: 6.66px solid transparent;
-  border-bottom: 6.66px solid transparent
+  	border-bottom: 6.66px solid transparent
 }

 .arrow:after {
@@ -38,52 +38,49 @@
 }

 .arrow.green:before {
-  border-left: 10px solid #28a745;
+  	border-left: 10px solid #28a745;
 }
 .arrow.green:after {
-  background-color:#28a745;
+  	background-color:#28a745;
 }

 .arrow.red:before {
-  border-left: 10px solid #dc3545;
+  	border-left: 10px solid #dc3545;
 }
 .arrow.red:after {
-  background-color:#dc3545;
+  	background-color:#dc3545;
 }

 .arrow.grey:before {
-  border-left: 10px solid #6c757d;
+  	border-left: 10px solid #6c757d;
 }

 .arrow.grey:after {
-  background-color:#6c757d;
+  	background-color:#6c757d;
 }

 .scriptmessage {
-	max-width: 280px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	vertical-align: middle;
+	width: 100%;
+	max-width: 50px;
+	@media (min-width: 768px) {
+		max-width: 200px;
+	}
 }

 .scriptmessage.longer {
 	max-width: 500px;
+	@media (min-width: 375px) {
+		max-width: 200px !important;
+	}
 }

-@media (max-width: 767.98px) {
-	.mobile-bottomcol {
-		margin-top: 15px;
-	}
-
-	.scriptmessage {
-		max-width: 90px !important;
-	}
-	.scriptmessage.longer {
-		max-width: 280px !important;
-	}
-
-	.details-table td:first-child {
-		white-space: pre-wrap;
+.mobile-bottomcol {
+	margin-top: 15px;
+	@media (min-width: 992px) {
+		margin-top: 0px;
 	}
 }

@@ -93,6 +90,9 @@

 .details-table td {
 	padding: 0.75rem;
+	&:first-child {
+		white-space: pre-wrap;
+	}
 }

 .details-table td:nth-child(2) {
@@ -101,3 +101,58 @@
 	font-family: "Courier New", Courier, monospace;
 	font-size: 12px;
 }
+
+.smaller-text {
+	font-size: 12px;
+	@media (min-width: 576px) {
+		font-size: 14px !important;
+	}
+}
+
+.longer {
+	max-width: 100% !important;
+    width: 200px;
+    display: inline-block;
+}
+
+.row{
+	flex-direction: column;
+	@media (min-width: 992px) {
+		flex-direction: row;
+	}
+}
+
+.extra-info {	
+	display: none;
+	@media (min-width: 576px) {
+		display: inline-table;
+	}
+	.fiat {
+		font-size: 14px;
+		margin-left: 10px;
+		text-align: right;
+	}
+	.sats {
+		color: #ffffff66;
+		font-size: 11px;
+	}
+}
+
+.transaction-fee {
+	display: block;
+	margin: 0px auto 5px;
+	@media (min-width: 576px) {
+		display: inline-table;
+	}
+}
+
+.btn-container {
+	text-align: right;
+	@media (min-width: 576px) {
+		display: inline-table;
+		float: right;
+	}
+}
+.fiat {
+	margin-left: 10px; 
+}