From 99570c9c079ba59d83a26dd0f01567b82eb83255 Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Mon, 31 Jul 2017 22:27:33 +0200
Subject: [PATCH] Responsive header for not connected pages too
---
app/assets/stylesheets/header.scss | 10 ++++++++++
app/views/layouts/_header.html.haml | 5 +----
app/views/layouts/_header_not_connected.haml | 16 ++++++++++++----
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss
index c464812c08..46a9ae2a06 100644
--- a/app/assets/stylesheets/header.scss
+++ b/app/assets/stylesheets/header.scss
@@ -117,6 +117,16 @@
}
}
+ .not-connected-menu {
+ .navbar-left {
+ float: left;
+ }
+ .navbar-right,
+ .navbar-right li {
+ float: right;
+ }
+ }
+
@media (max-width: $grid-float-breakpoint-max) {
.navbar-nav.hidden-xs {
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 4cbacd478d..9b857941b1 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -9,7 +9,4 @@
.container-fluid
.row
.col-md-12
- .navbar-header
-
- .collapse.navbar-collapse#navbar-collapse
- = render "layouts/header_not_connected"
+ = render "layouts/header_not_connected"
diff --git a/app/views/layouts/_header_not_connected.haml b/app/views/layouts/_header_not_connected.haml
index a3d1bcae37..4f9ce9473a 100644
--- a/app/views/layouts/_header_not_connected.haml
+++ b/app/views/layouts/_header_not_connected.haml
@@ -1,4 +1,12 @@
-%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"
+.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"
--
GitLab