diff --git a/apps/block_scout_web/assets/css/app.scss b/apps/block_scout_web/assets/css/app.scss index 3225490106..dcaddd91dd 100644 --- a/apps/block_scout_web/assets/css/app.scss +++ b/apps/block_scout_web/assets/css/app.scss @@ -37,16 +37,17 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "node_modules/bootstrap/scss/progress"; // Bootstrap Components +@import "node_modules/bootstrap/scss/alert"; +@import "node_modules/bootstrap/scss/badge"; +@import "node_modules/bootstrap/scss/card"; @import "node_modules/bootstrap/scss/dropdown"; -@import "node_modules/bootstrap/scss/transitions"; -@import "node_modules/bootstrap/scss/tables"; +@import "node_modules/bootstrap/scss/forms"; @import "node_modules/bootstrap/scss/nav"; @import "node_modules/bootstrap/scss/navbar"; -@import "node_modules/bootstrap/scss/card"; -@import "node_modules/bootstrap/scss/forms"; +@import "node_modules/bootstrap/scss/pagination"; +@import "node_modules/bootstrap/scss/tables"; @import "node_modules/bootstrap/scss/tooltip"; -@import "node_modules/bootstrap/scss/badge"; -@import "node_modules/bootstrap/scss/alert"; +@import "node_modules/bootstrap/scss/transitions"; // Code highlight @import "node_modules/highlight.js/styles/default"; diff --git a/apps/block_scout_web/assets/css/components/_pagination.scss b/apps/block_scout_web/assets/css/components/_pagination.scss index ee2a1f0f56..7b97d08803 100644 --- a/apps/block_scout_web/assets/css/components/_pagination.scss +++ b/apps/block_scout_web/assets/css/components/_pagination.scss @@ -1,35 +1,42 @@ +$pagination-page-link-background: #f5f6fa !default; +$pagination-page-link-color: #a3a9b5 !default; +$pagination-page-link-background-active: $primary !default; +$pagination-page-link-color-active: #fff !default; + .pagination { - display: block; + margin: 0; + padding: 30px; - &-list { - list-style: none; - margin: 0; - padding: 0; - white-space: nowrap; - } + .page-item { + margin: 0 10px 0 0; - li { - font-size: 13px; - display: inline-block; - margin: 0; - margin-right: explorer-size(-3); - &:last-of-type { margin-right: 0; } + &:last-child { + margin-right: 0; + } } - &-link { - display: block; - line-height: 1; - color: $gray-400; - text-decoration: none; - padding: 7px 9px; - border: 1px solid $border-color; - border-radius: $border-radius; + .page-link { + background-color: $pagination-page-link-background; + border: 1px solid $pagination-page-link-background; + color: $pagination-page-link-color; + display: block; + line-height: 1.25; + margin: 0; + padding: 0.5rem 0.75rem; + position: relative; - &:hover, - &.is-current { - border-color: $primary; - background: $primary; - color: $white; - } + &:hover { + background-color: darken($pagination-page-link-background, 5%); + border-color: darken($pagination-page-link-background, 5%); + } + + .active & { + &, + &:hover { + background-color: $pagination-page-link-background-active; + border-color: $pagination-page-link-background-active; + color: $pagination-page-link-color-active; + } + } } -} +} \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/components/_stakes_table.scss b/apps/block_scout_web/assets/css/components/_stakes_table.scss index d38abd1396..a1e656b3ec 100644 --- a/apps/block_scout_web/assets/css/components/_stakes_table.scss +++ b/apps/block_scout_web/assets/css/components/_stakes_table.scss @@ -53,7 +53,8 @@ $stakes-table-cell-separation: 25px !default; .stakes-td-order { min-width: 50px; - text-align: center; + padding-left: 30px; + text-align: left; } .stakes-td-link-style { diff --git a/apps/block_scout_web/lib/block_scout_web/templates/common_components/_pagination.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_pagination.html.eex new file mode 100644 index 0000000000..84ab89ee80 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_pagination.html.eex @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/apps/block_scout_web/lib/block_scout_web/templates/stakes/_stakes_table.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/stakes/_stakes_table.html.eex index f1686dc29a..97d54b6a12 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/stakes/_stakes_table.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/stakes/_stakes_table.html.eex @@ -19,7 +19,7 @@ <%= end %> <%= if not @empty_content do %> - +
1
<%= @@ -41,9 +41,7 @@ 2.56% 3500 -
- <%= render BlockScoutWeb.StakesView, "_stakes_control_stake.html" %> -
+ Banned until block #345345 (15 May 2020) <%= for i <- 2..5 do %> @@ -80,4 +78,8 @@ <%= end %> - \ No newline at end of file + +<%= + render BlockScoutWeb.CommonComponentsView, + "_pagination.html" +%> \ No newline at end of file