Merge branch '239861-move-terminal-styles' into 'master'

Move terminal CSS to page bundle

See merge request gitlab-org/gitlab!45364

app/assets/stylesheets/page_bundles/terminal.scss

+#terminal > div {
+  min-height: 450px;
+}

app/assets/stylesheets/pages/pipelines.scss

@@ -89,26 +89,6 @@
   }
 }
 
-/**
- * Terminal
- */
-[data-page='projects:jobs:terminal'],
-[data-page='projects:environments:terminal'] {
-  .terminal-container {
-    .content-block {
-      border-bottom: 0;
-    }
-
-    #terminal {
-      margin-top: 10px;
-
-      > div {
-        min-height: 450px;
-      }
-    }
-  }
-}
-
 .pipelines-container .top-area .nav-controls > .btn:last-child {
   float: none;
 }

app/views/projects/environments/terminal.html.haml

 - page_title _("Terminal for environment"), @environment.name
-
+- add_page_specific_style 'page_bundles/terminal'
 - content_for :page_specific_javascripts do
   = stylesheet_link_tag "xterm.css"
 
@@ -18,4 +18,4 @@
         = render 'projects/deployments/actions', deployment: @environment.last_deployment
 
 .terminal-container{ class: container_class }
-  #terminal{ data: { project_path: "#{terminal_project_environment_path(@project, @environment)}.ws" } }
+  #terminal.gl-mt-4{ data: { project_path: "#{terminal_project_environment_path(@project, @environment)}.ws" } }

app/views/projects/jobs/terminal.html.haml

@@ -2,9 +2,10 @@
 - add_to_breadcrumbs "##{@build.id}", project_job_path(@project, @build)
 - breadcrumb_title _('Terminal')
 - page_title _('Terminal'), "#{@build.name} (##{@build.id})", _('Jobs')
-
+- add_page_specific_style 'page_bundles/terminal'
 - content_for :page_specific_javascripts do
   = stylesheet_link_tag "xterm.css"
 
+
 .terminal-container
-  #terminal{ data: { project_path: terminal_project_job_path(@project, @build, format: :ws) } }
+  #terminal.gl-mt-4{ data: { project_path: terminal_project_job_path(@project, @build, format: :ws) } }

config/application.rb

@@ -191,6 +191,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/pipeline.css"
     config.assets.precompile << "page_bundles/pipelines.css"
     config.assets.precompile << "page_bundles/productivity_analytics.css"
+    config.assets.precompile << "page_bundles/terminal.css"
     config.assets.precompile << "page_bundles/todos.css"
     config.assets.precompile << "page_bundles/reports.css"
     config.assets.precompile << "page_bundles/xterm.css"