summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/gemeinschaft-generic.css.scss11
-rw-r--r--app/views/layouts/_navbar.html.haml12
2 files changed, 17 insertions, 6 deletions
diff --git a/app/assets/stylesheets/gemeinschaft-generic.css.scss b/app/assets/stylesheets/gemeinschaft-generic.css.scss
index e594d67..044b87b 100644
--- a/app/assets/stylesheets/gemeinschaft-generic.css.scss
+++ b/app/assets/stylesheets/gemeinschaft-generic.css.scss
@@ -6,6 +6,17 @@ body {
padding-top: 60px;
padding-bottom: 40px;
}
+
+// Nav
+li.display {
+ line-height: 40px;
+ img {
+ vertical-align: middle;
+ width: 26px;
+ margin-top: -2px;
+ }
+}
+
@media (max-width: 979px) {
body {
padding-top: 0px;
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index 7084090..8e09859 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -28,9 +28,9 @@
- if current_user
%ul.nav.pull-right
- %li
+ %li.display
- if current_user.image?
- =image_tag(current_user.image_url(:mini).to_s, :class => 'img-rounded')
+ = image_tag(current_user.image_url(:mini).to_s, :class => 'img-rounded')
- else
- if current_user.male?
= image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
@@ -39,15 +39,15 @@
- if current_page?(tenant_user_path(current_user.current_tenant, current_user))
%li.active
- %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)}
+ %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)}
= current_user
- else
%li
- %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)}
+ %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)}
= current_user
- if single_sign_on_system? == false
%li
- %a.navbar-link{:href => log_out_path}
+ %a.navbar-link{:href => log_out_path}
%i.icon-off.icon-white
-
+