CipherLabs
/
blockscout
mirror of https://github.com/blockscout/blockscout
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4540 from blockscout/np-allign-copy-btns

Browse Source 
Allign copy button
pull/4568/head
Victor Baranov 3 years ago committed by GitHub
parent e12cae51d5 6d7d6e6d5c
commit 9985be3e1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 806 additions and 787 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 31
      apps/block_scout_web/assets/css/_mixins.scss
  3. 5
      apps/block_scout_web/assets/css/components/_btn_copy.scss
  4. 30
      apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex
  5. 46
      apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
  6. 740
      apps/block_scout_web/priv/gettext/default.pot
  7. 740
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po

1
CHANGELOG.md
Unescape View File

@ -1,6 +1,7 @@
## Current ## Current
### Features ### Features
- [#4540](https://github.com/blockscout/blockscout/pull/4540) - Allign copy buttons for `Block Details` and `Transaction Details` pages
- [#4528](https://github.com/blockscout/blockscout/pull/4528) - Block Details page: rework view - [#4528](https://github.com/blockscout/blockscout/pull/4528) - Block Details page: rework view
- [#4531](https://github.com/blockscout/blockscout/pull/4531) - Add Arbitrum support - [#4531](https://github.com/blockscout/blockscout/pull/4531) - Add Arbitrum support
- [#4524](https://github.com/blockscout/blockscout/pull/4524) - Add index position of transaction in the block - [#4524](https://github.com/blockscout/blockscout/pull/4524) - Add index position of transaction in the block

31
apps/block_scout_web/assets/css/_mixins.scss
Unescape View File

@ -213,6 +213,37 @@
} }
} }
@mixin square-icon-button-inline($color, $dimensions) {
align-items: center;
border: 1px solid $color;
border-radius: 2px;
cursor: pointer;
display: inline;
height: $dimensions;
justify-content: center;
transition: $transition-cont;
width: $dimensions;
svg {
display: block;
height: 100%;
width: 100%;
}
path {
fill: $color;
transition: $transition-cont;
}
&:hover {
background-color: $color;
path {
fill: #fff;
}
}
}
@mixin image-2x($image, $width: 100%, $height: 100%) { @mixin image-2x($image, $width: 100%, $height: 100%) {
@media (min--moz-device-pixel-ratio: 1.3), @media (min--moz-device-pixel-ratio: 1.3),
(-o-min-device-pixel-ratio: 2.6/2), (-o-min-device-pixel-ratio: 2.6/2),

5
apps/block_scout_web/assets/css/components/_btn_copy.scss
Unescape View File

@ -3,7 +3,7 @@ $btn-copy-dimensions: 31px !default;
$btn-copy-small-dimensions: 22px !default; $btn-copy-small-dimensions: 22px !default;
.btn-copy-icon { .btn-copy-icon {
@include square-icon-button($btn-copy-color, $btn-copy-dimensions); @include square-icon-button-inline($btn-copy-color, $btn-copy-dimensions);
&.btn-copy-icon-no-borders { &.btn-copy-icon-no-borders {
&:hover { &:hover {
background-color: transparent; background-color: transparent;
@ -20,9 +20,8 @@ $btn-copy-small-dimensions: 22px !default;
&.btn-copy-icon-small { &.btn-copy-icon-small {
&.btn-copy-icon-custom { &.btn-copy-icon-custom {
position: absolute; position: absolute;
top: -1.2px;
} }
@include square-icon-button($btn-copy-color, $btn-copy-small-dimensions); @include square-icon-button-inline($btn-copy-color, $btn-copy-small-dimensions);
&.btn-copy-icon-no-borders { &.btn-copy-icon-no-borders {
&:hover { &:hover {
background-color: transparent; background-color: transparent;

30
apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex
Unescape View File

@ -86,14 +86,12 @@
text: gettext("A block producer who successfully included the block onto the blockchain.") %> text: gettext("A block producer who successfully included the block onto the blockchain.") %>
<%= gettext("Miner") %> <%= gettext("Miner") %>
</dt> </dt>
<dd class="col-sm-9 col-lg-10 btn-copy-mobile-container"><%= render BlockScoutWeb.AddressView, "_link.html", address: @block.miner, contract: false, class: "", use_custom_tooltip: false, show_full_hash: true %> <dd class="col-sm-9 col-lg-10"><%= render BlockScoutWeb.AddressView, "_link.html", address: @block.miner, contract: false, class: "", use_custom_tooltip: false, show_full_hash: true %>
<span class="float-right"> <%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html",
<%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html", additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"],
additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"], clipboard_text: @block.miner,
clipboard_text: @block.miner, aria_label: gettext("Copy Address"),
aria_label: gettext("Copy Address"), title: gettext("Copy Address") %>
title: gettext("Copy Address") %>
</span>
</dd> </dd>
</dl> </dl>
<!-- Size --> <!-- Size -->
@ -112,13 +110,13 @@
text: gettext("The SHA256 hash of the block.") %> text: gettext("The SHA256 hash of the block.") %>
<%= gettext("Hash") %> <%= gettext("Hash") %>
</dt> </dt>
<dd class="col-sm-9 col-lg-10 btn-copy-mobile-container"><%= to_string(@block.hash) %><span class="float-right"> <dd class="col-sm-9 col-lg-10"><%= to_string(@block.hash) %>
<%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html", <%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html",
additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"], additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"],
clipboard_text: to_string(@block.hash), clipboard_text: to_string(@block.hash),
aria_label: gettext("Copy Hash"), aria_label: gettext("Copy Hash"),
title: gettext("Copy Hash") %> title: gettext("Copy Hash") %>
</span></dd> </dd>
</dl> </dl>
<%= unless @block.number == 0 do %> <%= unless @block.number == 0 do %>
<!-- Parent Hash --> <!-- Parent Hash -->
@ -128,17 +126,17 @@
text: gettext("The hash of the block from which this block was generated.") %> text: gettext("The hash of the block from which this block was generated.") %>
<%= gettext("Parent Hash") %> <%= gettext("Parent Hash") %>
</dt> </dt>
<dd class="col-sm-9 col-lg-10 btn-copy-mobile-container"><%= link( <dd class="col-sm-9 col-lg-10"><%= link(
@block.parent_hash, @block.parent_hash,
class: "transaction__link", class: "transaction__link",
to: block_path(@conn, :show, @block.number - 1) to: block_path(@conn, :show, @block.number - 1)
) %><span class="float-right"> ) %>
<%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html", <%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html",
additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"], additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"],
clipboard_text: to_string(@block.parent_hash), clipboard_text: to_string(@block.parent_hash),
aria_label: gettext("Copy Parent Hash"), aria_label: gettext("Copy Parent Hash"),
title: gettext("Copy Parent Hash") %> title: gettext("Copy Parent Hash") %>
</span></dd> </dd>
</dl> </dl>
<% end %> <% end %>
<!-- Difficulty --> <!-- Difficulty -->

46
apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
Unescape View File

@ -47,15 +47,13 @@
text: gettext("Unique character string (TxID) assigned to every verified transaction.") %> text: gettext("Unique character string (TxID) assigned to every verified transaction.") %>
<%= gettext "Transaction Hash" %> <%= gettext "Transaction Hash" %>
</dt> </dt>
<dd class="col-sm-9 col-lg-10 d-flex" style="word-break: break-all;"> <dd class="col-sm-9 col-lg-10" style="word-break: break-all;">
<span class="transaction-details-address" data-test="transaction_detail_hash"><%= @transaction %> </span> <span class="transaction-details-address" data-test="transaction_detail_hash"><%= @transaction %> </span>
<span>
<%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html", <%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html",
additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"], additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"],
clipboard_text: @transaction, clipboard_text: @transaction,
aria_label: gettext("Copy Transaction Hash"), aria_label: gettext("Copy Transaction Hash"),
title: gettext("Copy Txn Hash") %> title: gettext("Copy Txn Hash") %>
</span>
</dd> </dd>
</dl> </dl>
<!-- Verify in other explorers --> <!-- Verify in other explorers -->
@ -156,18 +154,16 @@
<%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html",
text: gettext("Address (external or contract) sending the transaction.") %> text: gettext("Address (external or contract) sending the transaction.") %>
<%= gettext "From" %></dt> <%= gettext "From" %></dt>
<dd class="col-sm-9 col-lg-10 btn-copy-mobile-container"> <dd class="col-sm-9 col-lg-10">
<%= link( <%= link(
from_address_hash, from_address_hash,
to: address_path(@conn, :show, from_address_hash) to: address_path(@conn, :show, from_address_hash)
) %> ) %>
<span class="float-right"> <%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html",
<%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html", additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"],
additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"], clipboard_text: from_address_hash,
clipboard_text: from_address_hash, aria_label: gettext("Copy From Address"),
aria_label: gettext("Copy From Address"), title: gettext("Copy From Address") %>
title: gettext("Copy From Address") %>
</span>
</dd> </dd>
</dl> </dl>
<!-- To --> <!-- To -->
@ -183,7 +179,7 @@
<%= gettext "To" %> <%= gettext "To" %>
<% end %> <% end %>
</dt> </dt>
<dd class="col-sm-9 col-lg-10 btn-copy-mobile-container"> <dd class="col-sm-9 col-lg-10">
<%= cond do %> <%= cond do %>
<% created_address_hash -> %> <% created_address_hash -> %>
[<%= gettext("Contract") %>&nbsp; [<%= gettext("Contract") %>&nbsp;
@ -192,27 +188,21 @@
to: address_path(@conn, :show, recipient_address_hash) to: address_path(@conn, :show, recipient_address_hash)
) %> ) %>
&nbsp;<%= gettext("created") %>] &nbsp;<%= gettext("created") %>]
<%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html",
<span class="float-right"> additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"],
<%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html", clipboard_text: recipient_address_hash,
additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"], aria_label: gettext("Copy To Address"),
clipboard_text: recipient_address_hash, title: gettext("Copy To Address") %>
aria_label: gettext("Copy To Address"),
title: gettext("Copy To Address") %>
</span>
<% recipient_address_hash -> %> <% recipient_address_hash -> %>
<%= link( <%= link(
recipient_address_hash, recipient_address_hash,
to: address_path(@conn, :show, recipient_address_hash) to: address_path(@conn, :show, recipient_address_hash)
) %> ) %>
<%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html",
<span class="float-right"> additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"],
<%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html", clipboard_text: recipient_address_hash,
additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"], aria_label: gettext("Copy To Address"),
clipboard_text: recipient_address_hash, title: gettext("Copy To Address") %>
aria_label: gettext("Copy To Address"),
title: gettext("Copy To Address") %>
</span>
<% true -> %> <% true -> %>
<% end %> <% end %>
</dd> </dd>

740
apps/block_scout_web/priv/gettext/default.pot
View File

File diff suppressed because it is too large Load Diff

740
apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save