Merge branch 'master' into fix/#1934-txs-with-errors-design

* master:
  Update CHANGELOG.md
  Update CHANGELOG.md
  Update _dropdown.scss
  Update _dai_variables.scss
  Update CHANGELOG.md
  Update _dai_variables.scss
  Update dai_logo.svg
  (update) changelog
  (fix) wrong tabs behavior
  (update) changelog
  (update) language files
  (fix) Missing tx hashes
  Add CHANGELOG entry
  Use PORT env variable in dev config

# Conflicts:
#	CHANGELOG.md
pull/2025/head
Gabriel Rodriguez Alsina 6 years ago
commit 64a44540b2
  1. 8
      CHANGELOG.md
  2. 6
      apps/block_scout_web/assets/css/app.scss
  3. 4
      apps/block_scout_web/assets/css/components/_dropdown.scss
  4. 78
      apps/block_scout_web/assets/css/components/_token_tile_view_more.scss
  5. 26
      apps/block_scout_web/assets/css/theme/_dai_variables.scss
  6. 19
      apps/block_scout_web/assets/js/lib/card_tabs.js
  7. 13
      apps/block_scout_web/assets/static/images/dai_logo.svg
  8. 12
      apps/block_scout_web/config/dev.exs
  9. 2
      apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex
  10. 2
      apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex
  11. 2
      apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex
  12. 2
      apps/block_scout_web/lib/block_scout_web/templates/transaction/_tabs.html.eex
  13. 4
      apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex
  14. 8
      apps/block_scout_web/priv/gettext/default.pot
  15. 9
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po

@ -1,7 +1,7 @@
## Current
### Features
- [#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) - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk
- [#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) - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk
- [#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
- [#1940](https://github.com/poanetwork/blockscout/pull/1940) - qr modal button and background issue
@ -20,8 +20,9 @@
- [#1807](https://github.com/poanetwork/blockscout/pull/1807) - New theming capabilites.
### Fixes
- [#2025](https://github.com/poanetwork/blockscout/pull/2025) - Added a new color to display transactions' errors.
- [#2033](https://github.com/poanetwork/blockscout/pull/2033) - Header nav. dropdown active element color issue
- [#2019](https://github.com/poanetwork/blockscout/pull/2019) - Fixed the missing tx hashes.
- [#2020](https://github.com/poanetwork/blockscout/pull/2020) - Fixed a bug triggered when a second click to a selected tab caused the other tabs to hide.
- [#1944](https://github.com/poanetwork/blockscout/pull/1944) - fixed styles for token's dropdown.
- [#1926](https://github.com/poanetwork/blockscout/pull/1926) - status label alignment
- [#1849](https://github.com/poanetwork/blockscout/pull/1849) - Improve chains menu
@ -48,6 +49,7 @@
- [#1975](https://github.com/poanetwork/blockscout/pull/1975) - add log index to transaction view
- [#1988](https://github.com/poanetwork/blockscout/pull/1988) - Fix wrong parity tasks names in Circle CI
- [#2000](https://github.com/poanetwork/blockscout/pull/2000) - docker/Makefile: always set a container name
- [#2018](https://github.com/poanetwork/blockscout/pull/2018) - Use PORT env variable in dev config
## 1.3.14-beta

@ -123,9 +123,9 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
@import "components/errors";
:export {
primary: $primary;
secondary: $secondary;
dashboardBannerChartAxisFontColor: $dashboard-banner-chart-axis-font-color;
dashboardLineColorMarket: $dashboard-line-color-market;
dashboardLineColorPrice: $dashboard-line-color-price;
dashboardBannerChartAxisFontColor: $dashboard-banner-chart-axis-font-color;
primary: $primary;
secondary: $secondary;
}

@ -52,6 +52,10 @@
font-weight: 700;
}
}
&.active {
background-color: $secondary;
}
&.division {
border-top: 1px solid $base-border-color;

@ -1,65 +1,47 @@
.token-tile-view-more {
line-height: 0.5;
align-items: center;
display: flex;
justify-content: space-between;
line-height: 1.2;
padding-top: 10px;
text-align: center;
&:hover,
:focus {
a {
text-decoration: none;
}
}
.token-tile-view-more span {
display: inline-block;
position: relative;
}
.token-tile-view-more span:before,
.token-tile-view-more span:after {
content: "";
position: absolute;
height: 5px;
border-bottom: 1px solid $border-color;
border-top: 1px solid $border-color;
top: 0;
width: 43%;
}
.token-tile-view-more span:before {
right: 55%;
margin-right: 0.9375rem;
}
&:before,
&:after {
border-bottom: 1px solid $border-color;
border-top: 1px solid $border-color;
content: "";
height: 4px;
flex-grow: 1;
.token-tile-view-more span:after {
left: 55%;
margin-left: 0.9375rem;
}
@include media-breakpoint-down(md) {
}
@include media-breakpoint-down(md) {
.token-tile-view-more span:before,
.token-tile-view-more span:after {
width: 40%;
@include media-breakpoint-down(sm) {
}
}
.token-tile-view-more span:before {
right: 58%;
}
&:before {
margin-right: 10px;
.token-tile-view-more span:after {
left: 58%;
}
}
@include media-breakpoint-down(md) {
}
@include media-breakpoint-down(sm) {
.token-tile-view-more span:before,
.token-tile-view-more span:after {
width: 28%;
@include media-breakpoint-down(sm) {
}
}
.token-tile-view-more span:before {
right: 66%;
}
&:after {
margin-left: 10px;
@include media-breakpoint-down(md) {
}
.token-tile-view-more span:after {
left: 66%;
@include media-breakpoint-down(sm) {
}
}
}

@ -1,14 +1,14 @@
// general
$primary: #2b2b2b;
$secondary: #ffb045;
$tertiary: #929292;
$primary: #17314f;
$secondary: #69b9d7;
$tertiary: #15bba6;
$additional-font: #ffffff;
// footer
$footer-background-color: $primary;
$footer-title-color: #fff;
$footer-text-color: #7e7e7e;
$footer-item-disc-color: $secondary;
$footer-text-color: #909dab;
$footer-item-disc-color: $tertiary;
.footer-logo { filter: brightness(0) invert(1); }
// dashboard
@ -24,7 +24,7 @@ $dashboard-banner-gradient-start: $primary; // gradient begin
$dashboard-banner-gradient-end: lighten($primary, 5); // gradient end
$dashboard-banner-network-plain-container-background-color: #424242; // stats bg
$dashboard-banner-network-plain-container-background-color: #20446e; // stats bg
// navigation
@ -35,16 +35,16 @@ $header-icon-color-hover: $secondary; // nav icon on hover
// buttons
$btn-line-bg: #fff; // button bg
$btn-line-color: #424242; // button border and font color && hover bg color
$btn-copy-color: #424242; // btn copy
$btn-qr-color: #424242; // btn qr-code
$btn-line-color: $primary; // button border and font color && hover bg color
$btn-copy-color: $primary; // btn copy
$btn-qr-color: $primary; // btn qr-code
//links & tile
.tile a { color: #4b89fb !important; } // links color for badges
.tile a { color: $tertiary !important; } // links color for badges
.tile-type-block {
border-left: 4px solid $secondary;
border-left: 4px solid $primary;
} // tab active bg
// card
$card-background-1: $secondary;
$card-tab-active: $secondary;
$card-background-1: #1b395c;
$card-tab-active: $tertiary;

@ -1,21 +1,26 @@
import $ from 'jquery'
$(function () {
const activeTabCard = $('.card-tab.active')
const tabCards = $('.js-card-tabs')
const activeTabCard = tabCards.find('.active')
const isMobileCardTabs = tabCards.children(':hidden').length
const isOnlyChild = !activeTabCard.siblings().length
if (!activeTabCard.siblings().length) {
if (isOnlyChild) {
activeTabCard.addClass('noCaret')
}
activeTabCard.on('click', function (e) {
e.preventDefault()
const siblings = $(this).siblings()
if (isMobileCardTabs) {
const siblings = $(this).siblings()
if (siblings.is(':hidden')) {
siblings.show()
} else {
siblings.hide()
if (siblings.is(':hidden')) {
siblings.show()
} else {
siblings.hide()
}
}
})
})

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 10 KiB

@ -6,10 +6,18 @@ use Mix.Config
# The watchers configuration can be used to run external
# watchers to your application. For example, we use it
# with webpack to recompile .js and .css sources.
port =
case System.get_env("PORT") && Integer.parse(System.get_env("PORT")) do
{port, _} -> port
:error -> nil
nil -> nil
end
config :block_scout_web, BlockScoutWeb.Endpoint,
http: [port: 4000],
http: [port: port || 4000],
https: [
port: 4001,
port: (port && port + 1) || 4001,
cipher_suite: :strong,
certfile: System.get_env("CERTFILE") || "priv/cert/selfsigned.pem",
keyfile: System.get_env("KEYFILE") || "priv/cert/selfsigned_key.pem"

@ -1,4 +1,4 @@
<div class="card-tabs">
<div class="card-tabs js-card-tabs">
<%= link(
gettext("Transactions"),
class: "card-tab #{tab_status("transactions", @conn.request_path)}",

@ -4,7 +4,7 @@
<section>
<div class="card mb-3">
<div class="card-tabs">
<div class="card-tabs js-card-tabs">
<%=
link(
gettext("Transactions"),

@ -1,4 +1,4 @@
<div class="card-tabs">
<div class="card-tabs js-card-tabs">
<%= link(
gettext("Token Transfers"),
class: "card-tab #{tab_status("token_transfers", @conn.request_path)}",

@ -1,4 +1,4 @@
<div class="card-tabs">
<div class="card-tabs js-card-tabs">
<%= if @show_token_transfers do %>
<%= link(
gettext("Token Transfers"),

@ -50,11 +50,9 @@
</div>
<%= if Enum.any?(remaining_token_transfers) do %>
<div class="col-md-12 d-flex flex-column mt-1 mb-2 text-center token-tile-view-more">
<span class="token-tile-more-lines">
<div class="token-tile-view-more">
<%= link gettext("View More Transfers"), to: "#transaction-#{@transaction.hash}", "data-toggle": "collapse", "data-selector": "token-transfer-open", "data-test": "token_transfers_expansion" %>
<%= link gettext("View Less Transfers"), class: "d-none", to: "#transaction-#{@transaction.hash}", "data-toggle": "collapse", "data-selector": "token-transfer-close" %>
</span>
</div>
<% end %>
<% end %>

@ -452,7 +452,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:39
#: lib/block_scout_web/templates/transaction/_tile.html.eex:76
#: lib/block_scout_web/templates/transaction/_tile.html.eex:74
msgid "IN"
msgstr ""
@ -597,7 +597,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:37
#: lib/block_scout_web/templates/transaction/_tile.html.eex:72
#: lib/block_scout_web/templates/transaction/_tile.html.eex:70
msgid "OUT"
msgstr ""
@ -980,12 +980,12 @@ msgid "View Contract"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/transaction/_tile.html.eex:56
#: lib/block_scout_web/templates/transaction/_tile.html.eex:55
msgid "View Less Transfers"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/transaction/_tile.html.eex:55
#: lib/block_scout_web/templates/transaction/_tile.html.eex:54
msgid "View More Transfers"
msgstr ""

@ -452,7 +452,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:39
#: lib/block_scout_web/templates/transaction/_tile.html.eex:76
#: lib/block_scout_web/templates/transaction/_tile.html.eex:74
msgid "IN"
msgstr ""
@ -597,7 +597,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:37
#: lib/block_scout_web/templates/transaction/_tile.html.eex:72
#: lib/block_scout_web/templates/transaction/_tile.html.eex:70
msgid "OUT"
msgstr ""
@ -980,12 +980,12 @@ msgid "View Contract"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/transaction/_tile.html.eex:56
#: lib/block_scout_web/templates/transaction/_tile.html.eex:55
msgid "View Less Transfers"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/transaction/_tile.html.eex:55
#: lib/block_scout_web/templates/transaction/_tile.html.eex:54
msgid "View More Transfers"
msgstr ""
@ -1107,6 +1107,7 @@ msgstr ""
msgid "GraphQL"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/pending_transaction/index.html.eex:32
msgid "Loading"
msgstr ""

Loading…
Cancel
Save