summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-06-07 09:41:58 +0000
committerPhil Hughes <me@iamphill.com>2019-06-07 09:41:58 +0000
commit1994a375cf7c9e4eee6366f3545f34b2549cbf02 (patch)
treefc2be1a457fab57d59280b5149c6306a541d3c6e /app/assets/stylesheets/framework
parent47ec712f8fe2dfc3ea85476ac44a197f6251b5c8 (diff)
parentde4b2c6a10f63ba801e9e4fb08ad4a8e21c20044 (diff)
downloadgitlab-ce-1994a375cf7c9e4eee6366f3545f34b2549cbf02.tar.gz
Merge branch 'ce-5276-1-remove-build-page-from-ide-terminal-element' into 'master'
[CE of Part 1] 5276 Remove 'build-page' from 'ide-terminal' element See merge request gitlab-org/gitlab-ce!29331
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r--app/assets/stylesheets/framework/mixins.scss10
1 files changed, 8 insertions, 2 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;