diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-31 08:07:51 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-31 08:07:51 +0000 |
| commit | acc0d8484505ed199fe8b9d2529d8f298d95bb80 (patch) | |
| tree | ee82638df3d413eb162394ab278cace2fa52b85d /app/views | |
| parent | 15d00fc3d3cfb941a1904840259b719f8bbf4eeb (diff) | |
| download | gitlab-ce-acc0d8484505ed199fe8b9d2529d8f298d95bb80.tar.gz | |
Moves the Performance Bar to the top instead of being at the bottom
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/_page.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 5 | ||||
| -rw-r--r-- | app/views/peek/views/_host.html.haml | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 873220cc73d..c4f8cd71395 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -1,4 +1,4 @@ -.page-with-sidebar{ class: "#{('page-with-new-sidebar' if defined?(@new_sidebar) && @new_sidebar)} #{page_gutter_class}" } +.page-with-sidebar{ class: page_with_sidebar_class } - if show_new_nav? - if defined?(nav) && nav = render "layouts/nav/#{nav}" @@ -9,7 +9,7 @@ = render "layouts/nav/#{nav}" - if content_for?(:sub_nav) = yield :sub_nav - .content-wrapper{ class: "#{(layout_nav_class unless show_new_nav?)}" } + .content-wrapper{ class: layout_nav_class } - if show_new_nav? .mobile-overlay .alert-wrapper diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 38b95d11fd4..b53f382fa3d 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,8 +1,9 @@ !!! 5 -%html{ lang: I18n.locale, class: "#{page_class}" } +%html{ lang: I18n.locale, class: page_class } = render "layouts/head" %body{ class: @body_class, data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}", find_file: find_file_path } } = render "layouts/init_auto_complete" if @gfm_form + = render 'peek/bar' - if show_new_nav? = render "layouts/header/new" - else @@ -10,5 +11,3 @@ = render 'layouts/page', sidebar: sidebar, nav: nav = yield :scripts_body - - = render 'peek/bar' diff --git a/app/views/peek/views/_host.html.haml b/app/views/peek/views/_host.html.haml new file mode 100644 index 00000000000..40769b5c6f6 --- /dev/null +++ b/app/views/peek/views/_host.html.haml @@ -0,0 +1,2 @@ +%span.current-host + = truncate(view.hostname) |