nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unify not connected header on desktop and mobile

Browse source
This commit is contained in:
fla 2015-12-29 23:24:23 +01:00
parent 119ded6fdc
commit 3a1235e2b2
4 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/stylesheets/mobile/header.scss
View file

@ -12,7 +12,6 @@ $mobile-navbar-height: 46px;
.login {
color: $white;
float: right;
font-weight: bold;
padding: 13px;
}
@ -24,6 +23,16 @@ $mobile-navbar-height: 46px;
min-height: $mobile-navbar-height;
}
.navbar-right {
float: right;
}
.navbar-nav {
margin-bottom: 0;
margin-top: 0;
li { float: left; }
}
#header-title {
padding: 7px 15px;
margin: 0 0 0 -15px;

5
app/views/layouts/_header.html.haml
View file

@ -19,7 +19,4 @@
= link_to AppConfig.settings.pod_name, root_path, class: "navbar-brand"
.collapse.navbar-collapse#navbar-collapse
%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'
= render "layouts/header_not_connected"

4
app/views/layouts/_header.mobile.haml
View file

@ -36,6 +36,4 @@
%span.icon-bar
- else
- 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"
= render "layouts/header_not_connected"

4
app/views/layouts/_header_not_connected.haml Normal file
View file

@ -0,0 +1,4 @@
%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"