From 5ef40b259d18d0d5d3c3ce67ac5cc97c539ac243 Mon Sep 17 00:00:00 2001 From: lzd <24379844+lzdw@users.noreply.github.com> Date: Wed, 18 Sep 2019 17:06:08 +0800 Subject: [PATCH] Menu: fix menu button in the mobile view (#19191) * replace "sandwich" (menu) button with logo(back home) if kiosk=tv * update navbar initialize padding-left befause menu button is overlapped by the navbar --- public/sass/components/_navbar.scss | 5 +++-- public/sass/components/_view_states.scss | 13 +++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss index 5e5091b52c7..ebabea49c8f 100644 --- a/public/sass/components/_navbar.scss +++ b/public/sass/components/_navbar.scss @@ -2,7 +2,7 @@ position: relative; z-index: $zindex-navbar-fixed; height: $navbarHeight; - padding: 0 20px 0 50px; + padding: 0 20px 0 60px; display: flex; flex-grow: 1; border-bottom: 1px solid transparent; @@ -44,7 +44,8 @@ } } -.panel-in-fullscreen { +.panel-in-fullscreen, +.panel-in-fullscreen.view-mode--tv { .navbar { padding-left: $navbar-padding; } diff --git a/public/sass/components/_view_states.scss b/public/sass/components/_view_states.scss index dff5bc78f41..69e5ae4c93b 100644 --- a/public/sass/components/_view_states.scss +++ b/public/sass/components/_view_states.scss @@ -9,10 +9,8 @@ } .navbar-page-btn { - transform: translate3d(-36px, 0, 0); - i { - opacity: 0; + display: none; } i.navbar-page-btn__folder-icon { @@ -49,9 +47,16 @@ box-shadow: none; .sidemenu__top, - .sidemenu__bottom { + .sidemenu__bottom, + .sidemenu__logo_small_breakpoint { display: none; } + + .sidemenu__logo { + @include media-breakpoint-down(sm) { + display: block; + } + } } .navbar {