diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss index 46a9ae2a0..6b884148a 100644 --- a/app/assets/stylesheets/header.scss +++ b/app/assets/stylesheets/header.scss @@ -1,7 +1,11 @@ .navbar.navbar-fixed-top { border-bottom: none; box-shadow: 1px 0 2px $black; - a:focus {outline: 0 none; } + a:focus { outline: 0 none; } + + .in { + overflow-y: visible; // Avoid search result dropdown to be hidden + } .navbar-brand { font-weight: bold; diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss index c1813042e..499bc7c18 100644 --- a/app/assets/stylesheets/mobile/header.scss +++ b/app/assets/stylesheets/mobile/header.scss @@ -37,6 +37,11 @@ $mobile-navbar-height: 46px; padding: 7px 15px; margin: 0 0 0 -15px; height: $mobile-navbar-height; + + img { + height: 30px; + width: 30px; + } } #nav-badges { @@ -87,12 +92,6 @@ $mobile-navbar-height: 46px; background-color: $red; } } - #header-title{ - img { - height: 30px; - width: 30px; - } - } } #drawer { diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 9b857941b..4459e7cd4 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -9,4 +9,11 @@ .container-fluid .row .col-md-12 - = render "layouts/header_not_connected" + .not-connected-menu + .navbar-header.navbar-left + .hidden-xs + = link_to AppConfig.settings.pod_name, root_path, class: "navbar-brand" + .visible-xs.header-title + = link_to(image_tag("branding/logos/asterisk_white_mobile.png", class: "img-responsive"), + root_path, class: "navbar-brand") + = render "layouts/header_not_connected" diff --git a/app/views/layouts/_header_not_connected.haml b/app/views/layouts/_header_not_connected.haml index 4f9ce9473..a3d1bcae3 100644 --- a/app/views/layouts/_header_not_connected.haml +++ b/app/views/layouts/_header_not_connected.haml @@ -1,12 +1,4 @@ -.not-connected-menu - .navbar-header.navbar-left - .hidden-xs - = link_to AppConfig.settings.pod_name, root_path, class: "navbar-brand" - .visible-xs#header-title - = link_to(image_tag("branding/logos/asterisk_white_mobile.png", class: "img-responsive"), - root_path, class: "navbar-brand") - - %ul.nav.navbar-nav.navbar-right - - if AppConfig.settings.enable_registrations? && !current_page?(controller: "/registrations", action: :new) - %li= link_to t("devise.shared.links.sign_up"), new_user_registration_path, class: "login" - %li= link_to t("devise.shared.links.sign_in"), new_user_session_path, class: "login" +%ul.nav.navbar-nav.navbar-right + - if AppConfig.settings.enable_registrations? && !current_page?(controller: "/registrations", action: :new) + %li= link_to t("devise.shared.links.sign_up"), new_user_registration_path, class: "login" + %li= link_to t("devise.shared.links.sign_in"), new_user_session_path, class: "login"