diff options
author | Phil Hughes <me@iamphill.com> | 2017-09-06 13:58:24 +0300 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-06 13:58:24 +0300 |
commit | ddb3692a2218e97dfcc256e21a0fccc97c5d9a56 (patch) | |
tree | aabb5e0b0d6f37ee068a8804ccef46b994d4afba /app/helpers/nav_helper.rb | |
parent | f497f170697c838747bb7cdaca2d1939f843a00c (diff) |
Clean up new navigation templates
Diffstat (limited to 'app/helpers/nav_helper.rb')
-rw-r--r-- | app/helpers/nav_helper.rb | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 73b3386fe9c..a23a43c9f43 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -1,8 +1,8 @@ module NavHelper 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 << 'page-with-new-sidebar' if defined?(@left_sidebar) && @left_sidebar + class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @left_sidebar class_name end @@ -30,23 +30,6 @@ module NavHelper end end - def nav_header_class - class_names = [] - class_names << 'with-horizontal-nav' if defined?(nav) && nav - - class_names - end - - def layout_nav_class - return 'page-with-new-nav' if show_new_nav? - - class_names = [] - class_names << 'page-with-layout-nav' if defined?(nav) && nav - class_names << 'page-with-sub-nav' if content_for?(:sub_nav) - - class_names - end - def nav_control_class "nav-control" if current_user end |