diff --git a/apps/explorer_web/assets/css/app.scss b/apps/explorer_web/assets/css/app.scss index 68d53c3c91..03e77f4465 100644 --- a/apps/explorer_web/assets/css/app.scss +++ b/apps/explorer_web/assets/css/app.scss @@ -19,12 +19,18 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "node_modules/bootstrap/scss/root"; @import "node_modules/bootstrap/scss/reboot"; @import "node_modules/bootstrap/scss/grid"; +@import "node_modules/bootstrap/scss/utilities/spacing"; +@import "node_modules/bootstrap/scss/utilities/sizing"; +@import "node_modules/bootstrap/scss/utilities/display"; +@import "node_modules/bootstrap/scss/utilities/flex"; +@import "node_modules/bootstrap/scss/utilities/text"; // Bootstrap Components @import "node_modules/bootstrap/scss/dropdown"; @import "node_modules/bootstrap/scss/transitions"; @import "node_modules/bootstrap/scss/tables"; @import "node_modules/bootstrap/scss/nav"; +@import "node_modules/bootstrap/scss/card"; //Custom theme @import "theme/theme_ribbon"; diff --git a/apps/explorer_web/assets/css/components/_chain.scss b/apps/explorer_web/assets/css/components/_chain.scss index 4eeef4e647..ca864a52b6 100644 --- a/apps/explorer_web/assets/css/components/_chain.scss +++ b/apps/explorer_web/assets/css/components/_chain.scss @@ -22,14 +22,10 @@ .container__stats { - @extend %paper; display: flex; - padding: 15px; - width: 100%; font-size: 12px; text-align: center; flex-direction: row; - justify-content: space-around; img { display: inline-block; @@ -39,7 +35,7 @@ } svg { - width: 30px; + height: 30px; } path { @@ -49,8 +45,6 @@ .stroke { stroke: $primary; } - - } .graph__squares { @@ -67,22 +61,11 @@ } } -.graph-flex { - font-size: 12px; - display: flex; - justify-content: space-between; - margin-top: 25px; - color: $gray-500; -} - @media (min-width: $explorer-breakpoint-md) { .container__stats { - width: 15%; - flex-direction: column; - align-content: space-between; color: $gray-500; - margin: 10px 5px; + width: 16.67%; img { display: inline-block; @@ -90,11 +73,12 @@ margin-bottom: explorer-size(-2); text-align: center; } + } - div { - flex-grow: 1; - } + .container__graph { + flex-grow: 1; } + .chain { &__image { height: explorer-size(1); diff --git a/apps/explorer_web/assets/css/components/_footer.scss b/apps/explorer_web/assets/css/components/_footer.scss index 1aba12669c..8b6878a608 100644 --- a/apps/explorer_web/assets/css/components/_footer.scss +++ b/apps/explorer_web/assets/css/components/_footer.scss @@ -5,6 +5,7 @@ background: $gray-100; color:$gray-600; text-align: center; + margin-top: 15px; padding: 14px; height: 50px; diff --git a/apps/explorer_web/assets/css/theme/_poa_variables.scss b/apps/explorer_web/assets/css/theme/_poa_variables.scss index e0992d5eeb..51ffd7f4f6 100644 --- a/apps/explorer_web/assets/css/theme/_poa_variables.scss +++ b/apps/explorer_web/assets/css/theme/_poa_variables.scss @@ -276,7 +276,7 @@ $lead-font-weight: 300 !default; $small-font-size: 80% !default; -$text-muted: $gray-600 !default; +$text-muted: $gray-500 !default; $blockquote-small-color: $gray-600 !default; $blockquote-font-size: ($font-size-base * 1.25) !default; diff --git a/apps/explorer_web/assets/css/theme/_theme_ribbon.scss b/apps/explorer_web/assets/css/theme/_theme_ribbon.scss index 5659eb441b..1b9b792925 100644 --- a/apps/explorer_web/assets/css/theme/_theme_ribbon.scss +++ b/apps/explorer_web/assets/css/theme/_theme_ribbon.scss @@ -59,7 +59,7 @@ //Ribbon FLip Syles -.card { +.ribbon { width: 100%; height: 100%; transition: all .5s; diff --git a/apps/explorer_web/lib/explorer_web/templates/address/overview.html.eex b/apps/explorer_web/lib/explorer_web/templates/address/overview.html.eex index a0828756fa..aaddb2be32 100644 --- a/apps/explorer_web/lib/explorer_web/templates/address/overview.html.eex +++ b/apps/explorer_web/lib/explorer_web/templates/address/overview.html.eex @@ -1,25 +1,34 @@ -
<%= gettext "Balance" %> | -
- <%= balance(@address) %>
- <%= formatted_usd(@address, @exchange_rate) %>
- |
-
---|---|
<%= gettext "Number of Transactions" %> | -<%= Cldr.Number.to_string!(@transaction_count) %> | -
<%= @address %>
+ ++ <%= gettext "Balance" %> + | ++ <%= balance(@address) %> + <%= formatted_usd(@address, @exchange_rate) %> + | +
---|---|
+ <%= gettext "Number of Transactions" %> + | ++ <%= Cldr.Number.to_string!(@transaction_count) %> + | +
<%= gettext "Parent Tx Hash" %> | +<%= gettext "Block" %> | +<%= gettext "Age" %> | +<%= gettext "From" %> | +<%= gettext "To" %> | +<%= gettext "Value" %> | + + <%= for internal_transaction <- @page do %> +
---|---|---|---|---|---|
+ <%= render ExplorerWeb.TransactionView, "_link.html", conn: @conn, transaction: internal_transaction.transaction %> + | ++ <%= link(internal_transaction.transaction.block, + to: block_path(@conn, :show, @conn.assigns.locale, internal_transaction.transaction.block) + ) %> + | +<%= ExplorerWeb.BlockView.age(internal_transaction.transaction.block) %> | ++ <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.from_address %> + | ++ <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.to_address %> + | +<%= ExplorerWeb.TransactionView.value(internal_transaction) %> | +
<%= gettext "There are no Internal Transactions" %>
+ <% end %><%= gettext "Parent Tx Hash" %> | -<%= gettext "Block" %> | -<%= gettext "Age" %> | -<%= gettext "From" %> | -<%= gettext "To" %> | -<%= gettext "Value" %> | - - <%= for internal_transaction <- @page do %> -
---|---|---|---|---|---|
- <%= render ExplorerWeb.TransactionView, "_link.html", conn: @conn, transaction: internal_transaction.transaction %> - | -- <%= link(internal_transaction.transaction.block, - to: block_path(@conn, :show, @conn.assigns.locale, internal_transaction.transaction.block) - ) %> - | -<%= ExplorerWeb.BlockView.age(internal_transaction.transaction.block) %> | -- <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.from_address %> - | -- <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.to_address %> - | -<%= ExplorerWeb.TransactionView.value(internal_transaction) %> | -
<%= gettext "There are no Internal Transactions" %>
- <% end %> + +- <%= gettext "Status" %> - | -<%= gettext "Hash" %> | -<%= gettext "Block" %> | -<%= gettext "Age" %> | -<%= gettext "From" %> | -- | <%= gettext "To" %> | -<%= gettext "Value" %> (<%= gettext "Ether" %>) | -<%= gettext "Fee" %> | -
---|
- | - <%= render ExplorerWeb.TransactionView, "_link.html", conn: @conn, transaction: transaction %> - | -- <%= link( - transaction.block, - to: block_path(@conn, :show, @conn.assigns.locale, transaction.block) - ) %> - | -<%= transaction.block.timestamp |> Timex.from_now %> | -- <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.from_address %> - | -- | - <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.to_address %> - | -<%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %> | -<%= ExplorerWeb.TransactionView.formatted_fee(transaction, denomination: :ether) %> | ++ <%= gettext "Status" %> + | +<%= gettext "Hash" %> | +<%= gettext "Block" %> | +<%= gettext "Age" %> | +<%= gettext "From" %> | ++ | <%= gettext "To" %> | +<%= gettext "Value" %> (<%= gettext "Ether" %>) | +<%= gettext "Fee" %> |
---|
@@ -9,8 +9,8 @@ ) %>