From de4b2c6a10f63ba801e9e4fb08ad4a8e21c20044 Mon Sep 17 00:00:00 2001
From: Paul Slaughter <pslaughter@gitlab.com>
Date: Thu, 6 Jun 2019 20:48:02 -0500
Subject: [PATCH] Remove 'build-page' from 'ide-terminal' element

CE Port

**Why?**
The styles applied to `.build-page .top-bar` were mostly
unecessary for the IDE terminal. The static positioning might
have also been causing a strange line to show up in the terminal.
---
 app/assets/stylesheets/framework/mixins.scss   | 10 ++++++++--
 .../stylesheets/page_bundles/_ide_mixins.scss  | 18 +++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index df40149f0a6..e7278554e6e 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -218,16 +218,22 @@
   }
 }
 
-@mixin build-trace-top-bar($height) {
+// Used in EE for Web Terminal
+@mixin build-trace-bar($height) {
   height: $height;
   min-height: $height;
   background: $gray-light;
   border: 1px solid $border-color;
   color: $gl-text-color;
+  padding: $grid-size;
+}
+
+@mixin build-trace-top-bar($height) {
+  @include build-trace-bar($height);
+
   position: -webkit-sticky;
   position: sticky;
   top: $header-height;
-  padding: $grid-size;
 
   .with-performance-bar & {
     top: $header-height + $performance-bar-height;
diff --git a/app/assets/stylesheets/page_bundles/_ide_mixins.scss b/app/assets/stylesheets/page_bundles/_ide_mixins.scss
index 896a3466cb4..9465dd5bed6 100644
--- a/app/assets/stylesheets/page_bundles/_ide_mixins.scss
+++ b/app/assets/stylesheets/page_bundles/_ide_mixins.scss
@@ -2,17 +2,17 @@
   display: flex;
   flex-direction: column;
   height: 100%;
-  margin-top: -$grid-size;
-  margin-bottom: -$grid-size;
-
-  &.build-page .top-bar {
-    top: 0;
-    height: auto;
-    font-size: 12px;
-    border-top-right-radius: $border-radius-default;
-  }
 
   .top-bar {
+    @include build-trace-bar(35px);
+
+    top: 0;
+    font-size: 12px;
+    border-top-right-radius: $border-radius-default;
     margin-left: -$gl-padding;
+
+    .controllers {
+      @include build-controllers(15px, center, false, 0, inline, 0);
+    }
   }
 }