Make flash notifications sticky

This commit also unifies layout structure
and remove no_container flag

3 files changed, 19 insertions, 24 deletions

diff --git a/app/views/projects/jobs/index.html.haml b/app/views/projects/jobs/index.html.haml
index afea5268006..5acb2af08e4 100644
--- a/app/views/projects/jobs/index.html.haml
+++ b/app/views/projects/jobs/index.html.haml
@@ -1,18 +1,16 @@
-- @no_container = true
 - page_title "Jobs"
 
-%div{ class: container_class }
-  .top-area
-    - build_path_proc = ->(scope) { project_jobs_path(@project, scope: scope) }
-    = render "shared/builds/tabs", build_path_proc: build_path_proc, all_builds: @all_builds, scope: @scope
+.top-area
+  - build_path_proc = ->(scope) { project_jobs_path(@project, scope: scope) }
+  = render "shared/builds/tabs", build_path_proc: build_path_proc, all_builds: @all_builds, scope: @scope
 
-    .nav-controls
-      - if can?(current_user, :update_build, @project)
-        - unless @repository.gitlab_ci_yml
-          = link_to 'Get started with Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
+  .nav-controls
+    - if can?(current_user, :update_build, @project)
+      - unless @repository.gitlab_ci_yml
+        = link_to 'Get started with Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
 
-        = link_to project_ci_lint_path(@project), class: 'btn btn-default' do
-          %span CI lint
+      = link_to project_ci_lint_path(@project), class: 'btn btn-default' do
+        %span CI lint
 
-  .content-list.builds-content-list
-    = render "table", builds: @builds, project: @project
+.content-list.builds-content-list
+  = render "table", builds: @builds, project: @project
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml
index a3688c17041..6bb27a65142 100644
--- a/app/views/projects/jobs/show.html.haml
+++ b/app/views/projects/jobs/show.html.haml
@@ -1,4 +1,3 @@
-- @no_container = true
 - add_to_breadcrumbs _("Jobs"), project_jobs_path(@project)
 - breadcrumb_title "##{@build.id}"
 - page_title "#{@build.name} (##{@build.id})", _("Jobs")
@@ -6,11 +5,10 @@
 - content_for :page_specific_javascripts do
   = stylesheet_link_tag 'page_bundles/xterm'
 
-%div{ class: container_class }
-  #js-job-vue-app{ data: { endpoint: project_job_path(@project, @build, format: :json), project_path: @project.full_path,
-    deployment_help_url: help_page_path('user/project/clusters/index.html', anchor: 'troubleshooting-failed-deployment-jobs'),
-    runner_help_url: help_page_path('ci/runners/README.html', anchor: 'setting-maximum-job-timeout-for-a-runner'),
-    runner_settings_url: project_runners_path(@build.project, anchor: 'js-runners-settings'),
-    variables_settings_url: project_variables_path(@build.project, anchor: 'js-cicd-variables-settings'),
-    page_path: project_job_path(@project, @build), build_status: @build.status, build_stage: @build.stage, log_state: '',
-    build_options: javascript_build_options } }
+#js-job-vue-app{ data: { endpoint: project_job_path(@project, @build, format: :json), project_path: @project.full_path,
+  deployment_help_url: help_page_path('user/project/clusters/index.html', anchor: 'troubleshooting-failed-deployment-jobs'),
+  runner_help_url: help_page_path('ci/runners/README.html', anchor: 'setting-maximum-job-timeout-for-a-runner'),
+  runner_settings_url: project_runners_path(@build.project, anchor: 'js-runners-settings'),
+  variables_settings_url: project_variables_path(@build.project, anchor: 'js-cicd-variables-settings'),
+  page_path: project_job_path(@project, @build), build_status: @build.status, build_stage: @build.stage, log_state: '',
+  build_options: javascript_build_options } }
diff --git a/app/views/projects/jobs/terminal.html.haml b/app/views/projects/jobs/terminal.html.haml
index f7e7535ee92..5439a4b5d5c 100644
--- a/app/views/projects/jobs/terminal.html.haml
+++ b/app/views/projects/jobs/terminal.html.haml
@@ -1,4 +1,3 @@
-- @no_container = true
 - add_to_breadcrumbs 'Jobs', project_jobs_path(@project)
 - add_to_breadcrumbs "##{@build.id}", project_job_path(@project, @build)
 - breadcrumb_title 'Terminal'
@@ -7,5 +6,5 @@
 - content_for :page_specific_javascripts do
   = stylesheet_link_tag "xterm.css"
 
-.terminal-container{ class: container_class }
+.terminal-container
   #terminal{ data: { project_path: terminal_project_job_path(@project, @build, format: :ws) } }