diff options
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/nav_helper.rb | 19 | ||||
| -rw-r--r-- | app/helpers/preferences_helper.rb | 4 |
2 files changed, 23 insertions, 0 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index b63b3b70903..dad4c1f666a 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -1,10 +1,17 @@ module NavHelper +<<<<<<< HEAD def page_with_sidebar_class class_name = page_gutter_class class_name << 'page-with-new-sidebar' if defined?(@new_sidebar) && @new_sidebar class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @new_sidebar class_name +======= + def page_sidebar_class + if pinned_nav? + "page-sidebar-expanded page-sidebar-pinned" + end +>>>>>>> parent of aa792b91bb... Merge branch '26200-convert-sidebar-to-dropdown' into 'master' end def page_gutter_class @@ -34,7 +41,15 @@ module NavHelper class_names = [] class_names << 'with-horizontal-nav' if defined?(nav) && nav +<<<<<<< HEAD class_names +======= + if pinned_nav? + class_name << " header-sidebar-expanded header-sidebar-pinned" + end + + class_name +>>>>>>> parent of aa792b91bb... Merge branch '26200-convert-sidebar-to-dropdown' into 'master' end def layout_nav_class @@ -50,4 +65,8 @@ module NavHelper def nav_control_class "nav-control" if current_user end + + def pinned_nav? + cookies[:pin_nav] == 'true' + end end diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index d36bb4ab074..64605908c05 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -40,6 +40,10 @@ module PreferencesHelper ] end + def user_application_theme + Gitlab::Themes.for_user(current_user).css_class + end + def user_color_scheme Gitlab::ColorSchemes.for_user(current_user).css_class end |