diff --git a/frontend/src/app/assets/assets.component.html b/frontend/src/app/assets/assets.component.html index 71df124ef..5d5118af0 100644 --- a/frontend/src/app/assets/assets.component.html +++ b/frontend/src/app/assets/assets.component.html @@ -1,11 +1,11 @@
-

Registered assets

-
- +
+

Registered assets

+
-
+
@@ -27,7 +27,7 @@ {{ asset.ticker }} {{ asset.entity && asset.entity.domain }} {{ asset.asset_id | shortenString : 13 }} - + @@ -52,7 +52,7 @@ - + @@ -68,4 +68,4 @@
-
\ No newline at end of file +
diff --git a/frontend/src/app/assets/assets.component.scss b/frontend/src/app/assets/assets.component.scss index 2cfc390fb..9c337d291 100644 --- a/frontend/src/app/assets/assets.component.scss +++ b/frontend/src/app/assets/assets.component.scss @@ -3,4 +3,11 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; -} \ No newline at end of file +} +.title-asset { + h1 { + line-height: 1; + margin: 0px; + padding-bottom: 10px; + } +} diff --git a/frontend/src/app/components/address/address.component.html b/frontend/src/app/components/address/address.component.html index 8162cf6e5..9d02cf124 100644 --- a/frontend/src/app/components/address/address.component.html +++ b/frontend/src/app/components/address/address.component.html @@ -1,13 +1,14 @@
-

Address

-
- -

-   - {{ (transactions?.length | number) || '?' }} of {{ txCount | number }} transaction - {{ (transactions?.length | number) || '?' }} of {{ txCount | number }} transactions -

+
+

+   + {{ (transactions?.length | number) || '?' }} of {{ txCount | number }} transaction + {{ (transactions?.length | number) || '?' }} of {{ txCount | number }} transactions +

+
diff --git a/frontend/src/app/components/address/address.component.scss b/frontend/src/app/components/address/address.component.scss index db42056ac..bb1308a43 100644 --- a/frontend/src/app/components/address/address.component.scss +++ b/frontend/src/app/components/address/address.component.scss @@ -35,17 +35,22 @@ h1 { margin: 0px; padding: 0px; + margin-right: 10px; + font-size: 1.9rem; @media (min-width: 576px) { + font-size: 2rem; float: left; - margin-right: 10px; + } + @media (min-width: 768px) { + font-size: 2.5rem; } } .address-link { - line-height: 56px; + line-height: 56px; margin-left: 0px; top: -2px; - position: relative; + position: relative; @media (min-width: 768px) { line-height: 69px; } @@ -69,10 +74,20 @@ h1 { .tx-link { display: block; - width: 100%; - top: 14px; + height: 100%; + top: 9px; position: relative; + @media (min-width: 576px) { + top: 11px; + } @media (min-width: 768px) { - top: 20px; + top: 17px; } -} \ No newline at end of file +} + +.title-tx { + h2 { + line-height: 1; + margin-bottom: 10px; + } +} diff --git a/frontend/src/app/components/asset/asset.component.html b/frontend/src/app/components/asset/asset.component.html index 5332f7ca3..0b6eed756 100644 --- a/frontend/src/app/components/asset/asset.component.html +++ b/frontend/src/app/components/asset/asset.component.html @@ -1,11 +1,14 @@
-

Asset

- - {{ assetString | shortenString : 24 }} - {{ assetString }} - - -
+
@@ -72,12 +75,14 @@
-

- {{ (transactions?.length | number) || '?' }} of {{ txCount | number }}  - Peg In/Out and Burn Transactions - Issuance and Burn Transactions -

- +
+

+ {{ (transactions?.length | number) || '?' }} of {{ txCount | number }}  + Peg In/Out and Burn Transactions + Issuance and Burn Transactions +

+
+
diff --git a/frontend/src/app/components/asset/asset.component.scss b/frontend/src/app/components/asset/asset.component.scss index c5961e428..270ad97e3 100644 --- a/frontend/src/app/components/asset/asset.component.scss +++ b/frontend/src/app/components/asset/asset.component.scss @@ -20,4 +20,33 @@ margin-top: 20px; margin-right: 0px; } -} \ No newline at end of file +} + +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; + } +} + diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index 1ef8c6709..cc96660f4 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -2,8 +2,8 @@

- Genesis -
+ Genesis + @@ -11,10 +11,10 @@ -
+
- Block -
+ Block + @@ -28,7 +28,7 @@ -
+

@@ -162,7 +162,7 @@
-

+

{{ i }} transaction {{ i }} transactions @@ -175,14 +175,14 @@ -
+
-
+
-
+
@@ -199,7 +199,7 @@
- +
@@ -207,7 +207,7 @@ - +
diff --git a/frontend/src/app/components/block/block.component.scss b/frontend/src/app/components/block/block.component.scss index 46ade1ab4..067d250e2 100644 --- a/frontend/src/app/components/block/block.component.scss +++ b/frontend/src/app/components/block/block.component.scss @@ -18,7 +18,7 @@ } .fiat { - display: block; + display: block; font-size: 13px; @media (min-width: 768px) { font-size: 14px; @@ -40,10 +40,7 @@ h1 { margin: 0px; padding: 0px; - @media (min-width: 576px) { - float: left; - margin-right: 10px; - } + line-height: 1; a { &:hover, &:focus{ text-decoration: none;; @@ -87,32 +84,23 @@ h1 { } .block-tx-title { - padding-top: 10px; - display: block; - text-align: right; - margin-top: -30px; + display: flex; + justify-content: space-between; + flex-direction: column; + margin-top: -15px; + position: relative; @media (min-width: 550px) { - margin-top: 0px; - padding-top: 10px; + margin-top: 1rem; + flex-direction: row; } h2 { - display: inline-block; - float: left; - line-height: 1.6; + line-height: 1; margin: 0; - margin-bottom: -15px; - padding-right: 10px; - padding-top: 15px; position: relative; - top: -22px; - width: auto; + padding-bottom: 10px; @media (min-width: 550px) { - padding-top: 0px; - top: 0px; - } - @media (min-width: 768px) { - padding-top: 5px; - line-height: 1; + padding-bottom: 0px; + align-self: end; } } } @@ -122,22 +110,41 @@ h1 { } .next-previous-blocks { - font-size: 36px; + font-size: 28px; display: inline-block; - vertical-align: bottom; + @media (min-width: 768px) { + font-size: 36px; + } a { color: #1ad8f4; &:hover, &:focus { color: #09a3ba; display: inline-block; - // transform: scale(1.2); - // transition: 150ms all ease-in-out; } } } .disable { - font-size: 36px; + font-size: 28px; color: #393e5c73; -} \ No newline at end of file + @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; + } + } + } +} diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.html b/frontend/src/app/components/mempool-block/mempool-block.component.html index 2d72ff730..d59b3c477 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.html +++ b/frontend/src/app/components/mempool-block/mempool-block.component.html @@ -1,7 +1,7 @@
-

{{ ordinal$ | async }}

+

{{ ordinal$ | async }}

diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.scss b/frontend/src/app/components/mempool-block/mempool-block.component.scss index f40515844..e74689a9a 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.scss +++ b/frontend/src/app/components/mempool-block/mempool-block.component.scss @@ -4,13 +4,6 @@ top: 5px; } -.title-block { - color: #FFF; - padding-top: 20px; - padding-bottom: 3px; - border-top: 3px solid #FFF; -} - .fiat { font-size: 13px; display: inline-block; @@ -31,9 +24,9 @@ h1 { margin: 0px; padding: 0px; + line-height: 1; @media (min-width: 576px) { float: left; - margin-right: 10px; } } diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index 72aabd6cd..31d26f381 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -9,18 +9,18 @@
-
-
-

Transaction

-
+ +

Transaction

- + + +
@@ -34,7 +34,7 @@
-
+
@@ -192,15 +192,19 @@
-

Inputs & Outputs

+
+

Inputs & Outputs

+
- +
-

Details

+
+

Details

+
diff --git a/frontend/src/app/components/transaction/transaction.component.scss b/frontend/src/app/components/transaction/transaction.component.scss index b9c7b23f7..d6a736191 100644 --- a/frontend/src/app/components/transaction/transaction.component.scss +++ b/frontend/src/app/components/transaction/transaction.component.scss @@ -2,53 +2,48 @@ 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 { text-align: right; - width: 100%; - @media (min-width: 850px) { - width: auto; + align-self: start; + 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; } } +.title-block { + flex-direction: column; + @media (min-width: 650px) { + flex-direction: row; + } + h1 { + margin: 0rem; + line-height: 1; + } +} .tx-link { - display: block; - width: auto; - margin-bottom: 10px; - margin-left: 2px; - margin-top: 40px; - position: absolute; + display: flex; + margin-bottom: 0px; + margin-top: 8px; + @media (min-width: 650px) { + align-self: end; + margin-left: 15px; + margin-top: 0px; + margin-bottom: -3px; + } @media (min-width: 768px) { - margin-top: 14px; - margin-left: 10px; - position: relative; - text-align: left; - width: auto; - float: left; + margin-bottom: 0px; + top: 1px; + position: relative; } } @@ -77,10 +72,6 @@ h1{ color: #dc3545; } -.btn { - margin-top: 5px; -} - .container-xl { margin-bottom: 40px; } @@ -129,9 +120,26 @@ h1{ } } -.effective-fee-container{ +.effective-fee-container { display: block; @media (min-width: 768px){ display: inline-block; } -} \ No newline at end of file +} + + +.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; + } +} diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.scss b/frontend/src/app/components/transactions-list/transactions-list.component.scss index 42da648d6..5a96d2d3c 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.scss +++ b/frontend/src/app/components/transactions-list/transactions-list.component.scss @@ -4,22 +4,22 @@ } .green, .grey, .red { font-size: 16px; - top: -2px; + top: -2px; position: relative; @media( min-width: 576px){ font-size: 19px; } } .green { - color:#28a745; + color:#28a745; } .red { - color:#dc3545; + color:#dc3545; } .grey { - color:#6c757d; + color:#6c757d; } .mobile-bottomcol { @@ -43,7 +43,7 @@ } } -.extra-info { +.extra-info { display: none; @media (min-width: 576px) { display: inline-table; @@ -75,11 +75,11 @@ } } .fiat { - margin-left: 10px; + margin-left: 10px; } .tx-page-container { - padding: 10px; + padding: 10px; margin-bottom: 10px; margin-top: 10px; } @@ -112,6 +112,10 @@ width: 100%; color: #d43131; text-align: right; - margin-top: 0px; - margin-bottom: 10px; -} \ No newline at end of file + margin-top: 0px; + margin-bottom: 10px; +} + +h2 { + line-height: 1; +} diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index aee1f8b16..9c09212a9 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -199,6 +199,21 @@ body { 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 { font-size: 14px; } @@ -288,7 +303,7 @@ html:lang(ru) .card-title { left: -1px; position: relative; } - &:nth-child(4){ + &:nth-child(4) { display: none; } } @@ -379,10 +394,10 @@ html:lang(ru) .card-title { left: -1px; position: relative; } - &:nth-child(4){ + &:nth-child(4) { display: none; } - &:nth-child(5){ + &:nth-child(5) { display: none; } } @@ -457,10 +472,10 @@ html:lang(ru) .card-title { thead { th { - &:nth-child(4){ + &:nth-child(4) { display: table-cell; } - &:nth-child(5){ + &:nth-child(5) { display: table-cell; } } @@ -652,7 +667,7 @@ h1, h2, h3 { } } -.flex{ +.flex { display: flex; } @@ -673,125 +688,124 @@ th { .reserved { color: #ff8c00 } .rtl-layout { - .fa-arrow-alt-circle-right { - @extend .fa-arrow-alt-circle-right; - -webkit-transform: scaleX(-1); - transform: scaleX(-1); - } + .fa-arrow-alt-circle-right { + @extend .fa-arrow-alt-circle-right; + -webkit-transform: scaleX(-1); + transform: scaleX(-1); + } - .table td { - text-align: right; - .fiat { - @extend .fiat; - margin-left: 0px !important; - margin-right: 15px; - } + .table td { + text-align: right; + .fiat { + @extend .fiat; + margin-left: 0px !important; + margin-right: 15px; } + } - .table th { - text-align: right; + .table th { + 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 { - text-align: right; + .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; } + } - .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; + .container-graph { + @extend .container-graph; + .formRadioGroup { + @extend .formRadioGroup; direction: ltr; } + } - .tx-link { - @extend .tx-link; - margin-left: 0px; + .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; } - - .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 { overflow: hidden; display: inline-block; @@ -868,7 +882,7 @@ th { padding: 0; } - .collapsed{ + .collapsed { background-color: #2d3348; color: #1bd8f4; }