All requested changes for mobile menu performed

pull/2665/head
Yegor San 5 years ago
parent d6a6416971
commit 50ae7ca1af
  1. 41
      apps/block_scout_web/assets/css/components/_navbar.scss
  2. 48
      apps/block_scout_web/assets/css/theme/_dark-theme.scss
  3. 2
      apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex

@ -262,8 +262,6 @@ $navbar-logo-width: auto !default;
.nav-link-new { .nav-link-new {
margin-left: auto; margin-left: auto;
border-right: 1px solid #828ba0a1;
padding: 0px 11px 0px 5px;
font-size: 14px; font-size: 14px;
color: #333333; color: #333333;
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
@ -272,7 +270,10 @@ $navbar-logo-width: auto !default;
} }
.new-button { .new-button {
margin-right: -10px!important; margin-right: -7px !important;
padding-right: 0px;
height: 20px!important;
border-left: 1px solid #828ba0a1!important;
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
display: none!important; display: none!important;
} }
@ -326,17 +327,19 @@ $navbar-logo-width: auto !default;
.navbar.navbar-primary .navbar-nav .nav-link:focus { .navbar.navbar-primary .navbar-nav .nav-link:focus {
background-image: linear-gradient(to right, #f5f6fa, rgba(245, 246, 250, 0)); background-image: linear-gradient(to right, #f5f6fa, rgba(245, 246, 250, 0));
width: 100%; width: 100%;
border-left: 2px solid #5c33a2;
} }
.navbar.navbar-primary .navbar-nav .nav-link:hover:before { .navbar.navbar-primary .navbar-nav .nav-link:hover:before {
content: ""; content: "|";
position: absolute; height: 50px;
left: 0; width: 50%;
top: 0; opacity: 1;
height: 50px; background: none;
width: 50%; left: 24%;
border-left: 5px solid #726E97; top: 14%;
color: $primary;
} }
.navbar { .navbar {
padding: 0.5rem 0rem!important; padding: 0.5rem 0rem!important;
} }
@ -349,9 +352,18 @@ $navbar-logo-width: auto !default;
.dropdown-item:focus { .dropdown-item:focus {
background-image: linear-gradient(to right, #f5f6fa, rgba(245, 246, 250, 0)); background-image: linear-gradient(to right, #f5f6fa, rgba(245, 246, 250, 0));
width: 100%; width: 100%;
border-left: 2px solid #5c33a2;
background-color: white!important; background-color: white!important;
} }
.dropdown-item:hover:before {
content: "|";
height: 50px;
width: 50%;
opacity: 1;
background: none;
right: 17%;
color: $primary;
position: relative;
}
.dark-mode-changer svg path { .dark-mode-changer svg path {
fill: #a3a9b5!important; fill: #a3a9b5!important;
} }
@ -363,5 +375,10 @@ $navbar-logo-width: auto !default;
#toggleImage2 { #toggleImage2 {
display: none; display: none;
outline: none; outline: none;
padding-left: 5px;
padding-right: 5px;
}
#toggleImage1 {
width: 27px!important;
} }
} }

@ -68,7 +68,7 @@ $labels-dark: #8a8dba; // header nav, labels
} }
} }
.navbar.navbar-primary .navbar-toggler .navbar-toggler-icon { .navbar.navbar-primary .navbar-toggler .navbar-toggler-icon {
filter: invert(1); filter: invert(1);
} }
// footer // footer
@ -778,4 +778,48 @@ $labels-dark: #8a8dba; // header nav, labels
color: #fff; color: #fff;
} }
} }
} }
.navbar-dark .navbar-toggler {
color: rgba(255, 255, 255, 0.5);
border: none;
}
.dark-theme-applied .dropdown-item {
color: #fff!important;
}
.dark-theme-applied .dropdown-item.active, .dark-theme-applied .dropdown-item:hover, .dark-theme-applied .dropdown-item:focus {
background-image: none;
width: 100%;
background-color: #35335d!important;
}
.dark-theme-applied .dropdown-item:hover:before {
content: "|";
height: 50px;
width: 50%;
opacity: 1;
background: none;
right: 17%;
color: $dark-primary;
position: relative;
}
.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover,
.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link.activeLink,
.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:focus {
background-image: none;
width: 100%;
background-color: #35335d!important;
color: white;
border: none;
}
.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover:before
{
content: "|";
height: 50px;
width: 50%;
opacity: 1;
background: none;
left: 24%;
top: 14%;
color: $dark-primary;
}

@ -44,7 +44,7 @@
</span> </span>
<%= gettext("Blocks") %> <%= gettext("Blocks") %>
</a> </a>
<div class="dropdown-menu" id="checkIfSmall" aria-labelledby="navbarBlocksDropdown"> <div class="dropdown-menu" id="checkIfSmall" aria-labelledby="navbarBlocksDropdown">
<%= link to: block_path(@conn, :index), class: "dropdown-item #{tab_status("blocks", @conn.request_path)}" do %> <%= link to: block_path(@conn, :index), class: "dropdown-item #{tab_status("blocks", @conn.request_path)}" do %>
<%= gettext("Blocks") %> <%= gettext("Blocks") %>
<% end %> <% end %>

Loading…
Cancel
Save