Skip to content

Commit

Permalink
Merge pull request #250 from mantlenetworkio/release/v0.8.0
Browse files Browse the repository at this point in the history
merge release/v0.8.0 into main
  • Loading branch information
shellteo authored Jun 14, 2023
2 parents 5aa28e1 + c499790 commit 9f82885
Show file tree
Hide file tree
Showing 87 changed files with 3,590 additions and 390 deletions.
2 changes: 1 addition & 1 deletion apps/block_scout_web/assets/css/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ textarea.form-control {

.contract-address {
display: inline-block;
text-decoration: underline;
text-decoration: none;
text-decoration-style: dashed;
&:hover {
text-decoration-style: none;
Expand Down
105 changes: 104 additions & 1 deletion apps/block_scout_web/assets/css/components/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,42 @@ $card-tab-icon-color-active: #fff !default;
display:none;
}
}
.transaction_detail_status_container{
display: flex;
align-items: center;
flex-wrap: wrap;
.transaction_detail_status_item {
height: 36px;
padding: 0 16px 0 18px;
text-align: center;
line-height: 36px;
border-radius: 18px;
background: #F0F1F2;
margin: 0 9px 8px 0;
font-size: 14px;
font-family: Nunito;
font-weight: 700;
color: #6E767D;
.transaction_detail_status_item_right{
margin-right: 5px;
position: relative;
bottom:1px;
}
}
.transaction_detail_status_item_true{
margin-right: 9px;
margin-bottom: 8px;
}
.transaction_detail_status_item_active {
color: #15181C;
background: rgba(6, 221, 118, 0.5);
}
}
}

.txn-list-container{


.txn-list-table-head-container{
background:#F8F8F9;;
display:flex;
Expand All @@ -177,6 +209,30 @@ $card-tab-icon-color-active: #fff !default;
border-bottom:1px solid #F0F1F2;
color:#6c757e;
min-width: 1130px;
.l1-to-l2-tx-type-head{
color:#6c757e;
}
.dropdown-menu{
background: #F8F8F9;
border: 1px solid #F0F1F2;
box-shadow: 0px 4px 5px rgba(0, 0, 0, 0.02);
border-radius: 6px !important;
padding: 6px;
min-width: 100px;
width: auto;
.dropdown-item{
color: #15181C;
border-radius: 4px;
width: 120px;
line-height: 38px;
padding:0 8px;
&:hover{
font-weight: 700;
background: rgba(207, 210, 212, 0.3);

}
}
}
}
.recent-tx-list-page{
min-width: 1130px;
Expand All @@ -190,6 +246,12 @@ $card-tab-icon-color-active: #fff !default;
padding:0 10px;
border-bottom:1px solid #e7eaf3;
}
.display_tx_status_tooltip{
color: #212529;
&:hover {
color: #212529;
}
}
}
.dark-theme-applied{
.card-body {
Expand All @@ -200,10 +262,31 @@ $card-tab-icon-color-active: #fff !default;
background: rgba(255, 255, 255, 0.05);
color:#ffffff;
border-color: rgba(255, 255, 255, 0.15);
.l1-to-l2-tx-type-head{
color:#ffffff;
}
.dropdown-menu{
background: #152928;
box-shadow: 0px 4px 5px rgba(0, 0, 0, 0.02);
border:none;
.dropdown-item{
color: #ffffff;
background: #152928 !important;
&:hover{
background: #21413F !important;
}
}
}
}
.txn-list-table-item{
border-color:rgba(255,255,255,.1);
}
.display_tx_status_tooltip{
color: #ffffff;
&:hover {
color: #ffffff;
}
}
}
}

Expand Down Expand Up @@ -327,6 +410,9 @@ $card-tab-icon-color-active: #fff !default;
width:80px;
}
}
.recent-preview-item-content-latest-txs-tag-wrap-time{
min-width: 100px;
}
.recent-preview-item-content-latest-txs-tag-wrap{
margin-left:5px;
font-size:12px;position:relative;
Expand All @@ -337,6 +423,10 @@ $card-tab-icon-color-active: #fff !default;
color:#091312;
background:rgba(175, 208, 232, .35);
height:20px;
max-width: 148px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.recent-preview-item-content-latest-txs-tag{
position:absolute;
left:0;
Expand Down Expand Up @@ -423,7 +513,20 @@ $card-tab-icon-color-active: #fff !default;
}
}
}

.transaction_detail_status_container{

.transaction_detail_status_item {
background: #21413F;
color: #4F8F8B;
&:first-child {
margin-left: 0;
}
}
.transaction_detail_status_item_active {
color: #ffffff;
background: rgba(6, 221, 118, 0.5);
}
}
}

.card-tabs {
Expand Down
38 changes: 38 additions & 0 deletions apps/block_scout_web/assets/css/components/_custom_tooltips.scss
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,44 @@ $tooltip-background-color: $btn-line-color !default;
width: 150px !important;
}
}
.tooltip-inner {
.custom-tooltip-container{
//width: 275px;
p{
margin-bottom: 0;
}

.custom-tooltip-total-title{
font-family: 'Nunito';
font-style: normal;
font-weight: 800;
font-size: 14px;
line-height: 22px;
color: #15181C;
overflow: visible;
padding-bottom: 8px;
border-bottom: 1px solid #AED9D6;
margin-bottom: 8px;
white-space: nowrap;
}
.custom-tooltip-title{
font-family: 'Nunito';
font-weight: 900;
font-size: 14px;
text-align: start;
color: #2B3034;
line-height: 22px;
}
.custom-tooltip-content{
font-family: 'Nunito';
font-weight: 600;
font-size: 12px;
text-align: start;
color: #585F65;
line-height: 22px;
}
}
}

.custom-tooltip {
font-family: Nunito, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
Expand Down
2 changes: 1 addition & 1 deletion apps/block_scout_web/assets/css/components/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ $dropdown-menu-item-hover-background: rgba($secondary, 0.1) !default;
.dropdown-item {
color: $dropdown-menu-item-color;
font-size: 12px;
padding: 10px 20px;
padding: 10px 15px;
transition: $transition-cont;
white-space: initial;

Expand Down
9 changes: 7 additions & 2 deletions apps/block_scout_web/assets/css/components/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ $navbar-logo-width: 100% !default;
}
}
}
.navbar-nav-custom{
.dropdown-toggle::after{
display: none;
}
}

.navbar-toggler {
outline: none;
Expand Down Expand Up @@ -133,7 +138,7 @@ $navbar-logo-width: 100% !default;
position: relative;
width: 100%;
z-index: 1;
min-width: 320px;
min-width: 343px;
&[placeholder]{
text-overflow: ellipsis !important;
}
Expand All @@ -158,7 +163,7 @@ $navbar-logo-width: 100% !default;
min-width: 320px;
} */
@media (min-width: 1500px) {
width: 350px;
width: 383px;
}
@media (min-width: 1540px) {
width: 550px;
Expand Down
8 changes: 5 additions & 3 deletions apps/block_scout_web/assets/css/components/_tooltip.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
$tooltip-background-color: $btn-line-color !default;
$tooltip-background-color: #CBE9E7 !default;
$tooltip-color: #fff !default;

.tooltip {
max-width: 250px;
max-width: 335px;
min-width: 100px;
opacity: 1 !important;

.tooltip-inner {
background-color: $tooltip-background-color;
border-radius: 5px;
color: $tooltip-color;
color: #15181C;
padding: 15px;
font-size: 12px;
max-width: 335px;
}

.arrow::before {
Expand Down
37 changes: 29 additions & 8 deletions apps/block_scout_web/assets/css/theme/_mantle-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@ $dark-primary-alternate: #65B3AE !default;

.transfers-list-mobile-container {
max-height: 320px;
padding: 12px 0 12px 16px;
padding: 12px 16px 12px 16px;
background: #F8F8F9;
border-radius: 12px;
position: relative;
max-width: 650px;

overflow-y: auto;
box-sizing: border-box;

.transfers-list-mobile-scroll-notice{
position: absolute;
bottom: 0;
Expand All @@ -72,15 +74,20 @@ $dark-primary-alternate: #65B3AE !default;
}
.transfers-list-mobile-container-wrap{
width: 100%;
height: 100%;
overflow-y: auto;
//height: 100%;

}

.token-transfer-item {
display: flex;
padding-bottom: 10px;
margin-bottom: 10px;
flex-direction: column;
border-bottom: 1px solid rgba(207, 210, 212, 0.5);
&:last-child{
margin-bottom:0;
margin-bottom:0;
border: none;
padding-bottom: 0;
}
.token-transfer-item-item {
display: flex;
Expand All @@ -93,6 +100,7 @@ $dark-primary-alternate: #65B3AE !default;

.token-transfer-item-item-title {
margin-right: 16px;
width: 34px;
}
.token-transfer-item-item-address{
min-width: 130px;
Expand Down Expand Up @@ -136,6 +144,9 @@ $dark-primary-alternate: #65B3AE !default;
fill: $dark-text-content-color;
}
}
.transfers-list-mobile-container{
background: none;
}

// navbar
.navbar.navbar-primary {
Expand Down Expand Up @@ -617,12 +628,22 @@ $dark-primary-alternate: #65B3AE !default;

//tooltips
.tooltip .arrow:before {
border-top-color: $dark-primary;
border-bottom-color: $dark-primary;
border-top-color: #21413F;
border-bottom-color: #21413F;
}

.tooltip>.tooltip-inner {
background-color: $dark-primary;
background-color: #21413F;
color: #ffffff;
.custom-tooltip-total-title{
color: #ffffff;
}
.custom-tooltip-title{
color: #BFF6F2
}
.custom-tooltip-content{
color: #65B3AE
}
}

.tooltip-pale-color.bs-tooltip-top .arrow::before,
Expand Down
7 changes: 5 additions & 2 deletions apps/block_scout_web/assets/js/lib/autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { appendTokenIcon } from './token_icon'
import { escapeHtml } from './utils'
import xss from 'xss'

let placeHolder = 'Address/Txn hash/Block/Token'
let placeHolder = 'Address/Txn Hash/Block/Token/DA Hash'
const dataSrc = async (query, id) => {
try {
// Loading placeholder text
Expand Down Expand Up @@ -53,7 +53,8 @@ export const searchEngine = (query, record) => {
(record.symbol && record.symbol.toLowerCase().includes(queryLowerCase)) ||
(record.address_hash && record.address_hash.toLowerCase().includes(queryLowerCase)) ||
(record.tx_hash && record.tx_hash.toLowerCase().includes(queryLowerCase)) ||
(record.block_hash && record.block_hash.toLowerCase().includes(queryLowerCase))
(record.block_hash && record.block_hash.toLowerCase().includes(queryLowerCase)) ||
(record.tx_hash && record.type === 'eigenda')
)
) {
let searchResult = '<div>'
Expand Down Expand Up @@ -148,6 +149,8 @@ const selection = (event) => {
window.location = `/tx/${selectionValue.tx_hash}`
} else if (selectionValue.type === 'block') {
window.location = `/blocks/${selectionValue.block_hash}`
} else if (selectionValue.type === 'eigenda') {
window.location = `/eigenda-batch/${selectionValue.tx_hash}`
}
}

Expand Down
Loading

0 comments on commit 9f82885

Please sign in to comment.