diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-07 21:06:33 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-07 21:06:33 +0000 |
| commit | b9d4cb34ec7e2695f2830167fa9366fd2f13cf26 (patch) | |
| tree | 43b882264bb2155f62f03c2fb5766f7a8e1b9cde /app/helpers | |
| parent | 184889cc881deec2f46aaf0c7027c19d5319dad0 (diff) | |
| parent | 9127f32fc276bff1e38233d0b151386679fbac37 (diff) | |
| download | gitlab-ce-b9d4cb34ec7e2695f2830167fa9366fd2f13cf26.tar.gz | |
Merge branch 'collapse-sidebar-bugs' into 'master'
Remove JS flicker on page load; UI tweaks
See merge request !13347
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/nav_helper.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 14dc9bd9d62..0cfd7822d05 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -305,4 +305,8 @@ module ApplicationHelper def show_new_nav? cookies["new_nav"] == "true" end + + def collapsed_sidebar? + cookies["sidebar_collapsed"] == "true" + end end diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index b1205b8529b..b63b3b70903 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -2,6 +2,7 @@ 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 end |