From d4d4acf432cb9a1c7fbdd4b681d857107a4dde50 Mon Sep 17 00:00:00 2001 From: katibest Date: Tue, 19 Jun 2018 14:54:47 -0400 Subject: [PATCH 01/22] Header WIP --- apps/explorer_web/assets/css/app.scss | 2 + .../assets/css/components/navbar.scss | 25 ++++++ .../templates/layout/_footer.html.eex | 21 +++++ .../templates/layout/_ribbon.html.eex | 35 +------- .../templates/layout/_topnav.html.eex | 79 +++++++++++++++++-- .../templates/layout/app.html.eex | 3 +- 6 files changed, 123 insertions(+), 42 deletions(-) create mode 100644 apps/explorer_web/assets/css/components/navbar.scss diff --git a/apps/explorer_web/assets/css/app.scss b/apps/explorer_web/assets/css/app.scss index aadecd432b..bd13a7af17 100644 --- a/apps/explorer_web/assets/css/app.scss +++ b/apps/explorer_web/assets/css/app.scss @@ -37,6 +37,7 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "node_modules/bootstrap/scss/transitions"; @import "node_modules/bootstrap/scss/tables"; @import "node_modules/bootstrap/scss/nav"; +@import "node_modules/bootstrap/scss/navbar"; @import "node_modules/bootstrap/scss/card"; @import "node_modules/bootstrap/scss/forms"; @@ -63,6 +64,7 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "components/button"; @import "components/table"; @import "components/qr-code"; +@import "components/navbar"; :export { primary: $primary; diff --git a/apps/explorer_web/assets/css/components/navbar.scss b/apps/explorer_web/assets/css/components/navbar.scss new file mode 100644 index 0000000000..069f644e74 --- /dev/null +++ b/apps/explorer_web/assets/css/components/navbar.scss @@ -0,0 +1,25 @@ +.navbar-logo { + height: 36px; +} + +@media (min-width: 992px) { + .navbar-expand-lg .navbar-nav .nav-link { + padding-left: 1.75rem; + padding-right: 1.75rem; + } +} + +.navbar .form-control { + background: transparent; + width: 40%; + font-size: 11px; + +} + +.navbar .input-group-text { + background: none; +} + +.fa-search { + color: $white; +} diff --git a/apps/explorer_web/lib/explorer_web/templates/layout/_footer.html.eex b/apps/explorer_web/lib/explorer_web/templates/layout/_footer.html.eex index ab78ce870f..4f1e1937db 100644 --- a/apps/explorer_web/lib/explorer_web/templates/layout/_footer.html.eex +++ b/apps/explorer_web/lib/explorer_web/templates/layout/_footer.html.eex @@ -1,3 +1,24 @@ diff --git a/apps/explorer_web/lib/explorer_web/templates/layout/_ribbon.html.eex b/apps/explorer_web/lib/explorer_web/templates/layout/_ribbon.html.eex index 15b8bc8677..8f6f0c6182 100644 --- a/apps/explorer_web/lib/explorer_web/templates/layout/_ribbon.html.eex +++ b/apps/explorer_web/lib/explorer_web/templates/layout/_ribbon.html.eex @@ -1,29 +1,8 @@
- <%= link to: chain_path(@conn, :show), "data-test": "header_logo" do %> - " /> - <% end %> +