Skip to content

Commit

Permalink
Merge branch 'master' into ab-allow-total-difficulty-to-be-nil
Browse files Browse the repository at this point in the history
  • Loading branch information
ayrat555 committed Jun 4, 2019
2 parents a56bafc + 07abad7 commit 8e4d070
Show file tree
Hide file tree
Showing 47 changed files with 732 additions and 314 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
## Current

### Features
- [#1726](https://github.com/poanetwork/blockscout/pull/2071) - Updated styles for the new smart contract page.
- [#2081](https://github.com/poanetwork/blockscout/pull/2081) - Tooltip for 'more' button, explorers logos added
- [#1963](https://github.com/poanetwork/blockscout/pull/1963), [#1959](https://github.com/poanetwork/blockscout/pull/1959), [#1948](https://github.com/poanetwork/blockscout/pull/1948), [#1936](https://github.com/poanetwork/blockscout/pull/1936), [#1925](https://github.com/poanetwork/blockscout/pull/1925), [#1922](https://github.com/poanetwork/blockscout/pull/1922), [#1903](https://github.com/poanetwork/blockscout/pull/1903), [#1874](https://github.com/poanetwork/blockscout/pull/1874), [#1895](https://github.com/poanetwork/blockscout/pull/1895), [#2031](https://github.com/poanetwork/blockscout/pull/2031), [#2073](https://github.com/poanetwork/blockscout/pull/2073), [#2074](https://github.com/poanetwork/blockscout/pull/2074), - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk and default theme
- [#2010](https://github.com/poanetwork/blockscout/pull/2010) - added "block not found" and "tx not found pages"
- [#1928](https://github.com/poanetwork/blockscout/pull/1928) - pagination styles were updated
Expand All @@ -19,8 +21,10 @@
- [#2040](https://github.com/poanetwork/blockscout/pull/2040) - Verification links to other explorers for ETH
- [#2037](https://github.com/poanetwork/blockscout/pull/2037) - add address logs search functionality
- [#2012](https://github.com/poanetwork/blockscout/pull/2012) - make all pages pagination async
- [#2064](https://github.com/poanetwork/blockscout/pull/2064) - feat: add fields to tx apis, small cleanups

### Fixes
- [#2082](https://github.com/poanetwork/blockscout/pull/2082) - dropdown styles, tooltip gap fix, 404 page added
- [#2077](https://github.com/poanetwork/blockscout/pull/2077) - ui issues
- [#2072](https://github.com/poanetwork/blockscout/pull/2072) - Fixed checkmarks not showing correctly in tabs.
- [#2066](https://github.com/poanetwork/blockscout/pull/2066) - fixed length of logs search input
Expand Down
2 changes: 2 additions & 0 deletions apps/block_scout_web/assets/css/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
padding: 0 15px;
text-decoration: none;
transition: all 0.15s;
white-space: nowrap;
width: fit-content;

&:hover {
Expand Down Expand Up @@ -135,6 +136,7 @@
padding: 0 15px;
text-decoration: none;
transition: all 0.15s;
white-space: nowrap;
width: fit-content;

&:hover {
Expand Down
6 changes: 6 additions & 0 deletions apps/block_scout_web/assets/css/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
@import "components/verify_other_explorers";
@import "components/errors";
@import "components/log-search";


@import "components/new_smart_contract";
@import "components/radio_big";
@import "components/btn_no_border";

:export {
dashboardBannerChartAxisFontColor: $dashboard-banner-chart-axis-font-color;
dashboardLineColorMarket: $dashboard-line-color-market;
Expand Down
12 changes: 12 additions & 0 deletions apps/block_scout_web/assets/css/components/_btn_no_border.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
$btn-no-border-bg: #fff !default;
$btn-no-border-color: $primary !default;

.btn-no-border {
@include btn-line($btn-no-border-bg, $btn-no-border-color);

border-color: $btn-no-border-bg;

&:hover {
border-color: $btn-no-border-color;
}
}
3 changes: 3 additions & 0 deletions apps/block_scout_web/assets/css/components/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
box-shadow: $box-shadow;
padding: 0;
width: 100%;
border-left: 1px solid #e2e5ec;
border-right: 1px solid #e2e5ec;
border-bottom: 1px solid #e2e5ec;

&.right {
left: auto;
Expand Down
2 changes: 1 addition & 1 deletion apps/block_scout_web/assets/css/components/_filter.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.filter {
min-width: 100%;
transform: translate3d(1px, 26px, 0px) !important;
transform: translate3d(0, 34px, 0px) !important;
}
4 changes: 4 additions & 0 deletions apps/block_scout_web/assets/css/components/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ $form-control-border-color: #e2e5ec !default;
border-radius: 0;
font-size: 14px;

&.border-rounded {
border-radius: 4px;
}

&.n-b-r {
border-right: none;
}
Expand Down
204 changes: 204 additions & 0 deletions apps/block_scout_web/assets/css/components/_new_smart_contract.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
$new-smart-contract-container-tooltips-background-color: #fbfafc !default;
$new-smart-contract-tooltips-width: 300px;
$smart-contract-form-group-tooltip-color: #adb5bd !default;
$new-smart-contract-center-column-margin-right: 30px;

.new-smart-contract-container {
background-color: #fff;
background-image: linear-gradient(
to bottom right,
#{$new-smart-contract-container-tooltips-background-color} 100%,
#{$new-smart-contract-container-tooltips-background-color} 100%
);
background-position: 100% 0;
background-repeat: repeat-y;
background-size: #{$new-smart-contract-tooltips-width} 1px;
box-shadow: 0 0 25px 0 rgba(0, 0, 0, 0.15);
margin-bottom: 3rem;
padding: 50px 0 50px 22px;

@include media-breakpoint-down(md) {
background-image: none;
padding-right: 22px;
}
}

.smart-contract-title {
color: #333;
font-size: 18px;
font-weight: normal;
line-height: 1.2;
margin: 0 0 70px 0;
padding: 0;
text-align: left;

@include media-breakpoint-down(md) {
margin-bottom: 30px;
}

&.margin-bottom-md {
margin-bottom: 50px;

@include media-breakpoint-down(md) {
margin-bottom: 15px;
}
}
}

.smart-contract-form-group {
margin-bottom: 30px;

@include media-breakpoint-down(md) {
margin-bottom: 20px;
}
}

.form-radios-group {
display: flex;
justify-content: flex-start;

.radio-big {
margin-right: 20px;

&:last-child {
margin-right: 0;
}
}
}

.smart-contract-form-group-inner-wrapper {
display: flex;
justify-content: space-between;

@include media-breakpoint-down(md) {
flex-direction: column;
}

> label {
color: #333;
flex-grow: 0;
font-size: 14px;
font-weight: normal;
line-height: 1.7;
margin: 0;
padding-right: 15px;
text-align: left;
width: 200px;

@include media-breakpoint-down(md) {
margin-bottom: 10px;
padding-right: 0;
width: auto;
}
}

.center-column {
flex-grow: 1;
margin-right: $new-smart-contract-center-column-margin-right;

@include media-breakpoint-down(md) {
margin: 0;
}
}

textarea.form-control {
min-height: 98px;
}

.form-error {
display: block;
font-size: 13px;
line-height: 1.2;
padding-top: 10px;
}

.smart-contract-form-group-tooltip {
color: $smart-contract-form-group-tooltip-color;
flex-grow: 0;
flex-shrink: 0;
font-size: 12px;
font-weight: normal;
line-height: 1.5;
padding: 0 30px;
text-align: left;
width: #{$new-smart-contract-tooltips-width};

@include media-breakpoint-down(md) {
padding: 10px 0 0 0;
width: auto;
}

&:empty {
@include media-breakpoint-down(md) {
display: none;
}
}

a {
color: $smart-contract-form-group-tooltip-color;
text-decoration: underline;

&:hover {
text-decoration: none;
}
}
}
}

.tooltip-quote {
background: rgba(0, 0, 0, 0.08);
border-radius: 2px;
padding: 0 5px;
}


.add-contract-libraries-wrapper {
border-bottom: 1px solid $base-border-color;
margin-right: $new-smart-contract-center-column-margin-right + $new-smart-contract-tooltips-width;
padding-bottom: 30px;

@include media-breakpoint-down(md) {
margin-right: 0;
}
}

.smart-contract-form-buttons {
align-items: center;
border-top: 1px solid $base-border-color;
display: flex;
margin-right: $new-smart-contract-center-column-margin-right + $new-smart-contract-tooltips-width;
margin-top: -1px;
padding-top: 30px;
position: relative;

@include media-breakpoint-down(md) {
margin-right: 0;
}

[class*="btn-"] {
position: relative;
z-index: 1;
}

.position-absolute {
&,
&:hover {
opacity: 1;
z-index: 12;
}
}
}

.smart-contract-libraries-wrapper {
display: none;
padding-bottom: 30px;
padding-top: 30px;
}

.contract-library-form-group {
display: none;

&.active {
display: block;
}
}
55 changes: 55 additions & 0 deletions apps/block_scout_web/assets/css/components/_radio_big.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
$radio-big-color: $primary !default;
$radio-big-dimensions: 30px !default;

.radio-big {
align-items: center;
display: flex;
position: relative;

input[type="radio"] {
height: 100%;
opacity: 0;
position: absolute;
width: 100%;
z-index: 5;

&:checked + .radio-icon::before {
background-color: $radio-big-color;
border-radius: 50%;
content: "";
height: 12px;
left: 50%;
position: absolute;
top: 50%;
transform: translateX(-50%) translateY(-50%);
width: 12px;
}

&:checked + .radio-icon {
border-color: $radio-big-color;
}
}

.radio-icon {
border: 1px solid $base-border-color;
border-radius: 50%;
flex-grow: 0;
flex-shrink: 0;
height: $radio-big-dimensions;
margin: 0 10px 0 0;
position: relative;
width: $radio-big-dimensions;
z-index: 1;
}

.radio-text {
color: #333;
font-size: 14px;
font-weight: normal;
line-height: 1.2;
margin: 0;
position: relative;
white-space: nowrap;
z-index: 1;
}
}
5 changes: 5 additions & 0 deletions apps/block_scout_web/assets/css/components/_tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@ $tooltip-color: #fff !default;
border-bottom-color: $tooltip-background-color;
}
}

.bs-tooltip-top { top: -10px !important; }
.bs-tooltip-bottom { top: 10px !important; }
.bs-tooltip-left { left: -10px !important; }
.bs-tooltip-right { left: 10px !important; }
Loading

0 comments on commit 8e4d070

Please sign in to comment.