summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2018-10-04 21:07:24 +1000
committerSimon Knox <psimyn@gmail.com>2018-10-04 21:07:24 +1000
commita18074691a83d75b078d797fb70dcaed7d2e6001 (patch)
tree5817e48e0a6e18a7372327872d56be785f24a2e0
parent8a8ae2f57fe0db9b33f100e9a68c9eac4fd71c4d (diff)
downloadgitlab-ce-50552-unable-to-close-performance-bar.tar.gz
Make perfbar z-index above modal background50552-unable-to-close-performance-bar
-rw-r--r--app/assets/stylesheets/framework/variables_overrides.scss1
-rw-r--r--app/assets/stylesheets/performance_bar.scss3
-rw-r--r--changelogs/unreleased/50552-unable-to-close-performance-bar.yml5
3 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/variables_overrides.scss b/app/assets/stylesheets/framework/variables_overrides.scss
index 7d90452e1f4..759b4f333ca 100644
--- a/app/assets/stylesheets/framework/variables_overrides.scss
+++ b/app/assets/stylesheets/framework/variables_overrides.scss
@@ -18,3 +18,4 @@ $success: $green-500;
$info: $blue-500;
$warning: $orange-500;
$danger: $red-500;
+$zindex-modal-backdrop: 1040;
diff --git a/app/assets/stylesheets/performance_bar.scss b/app/assets/stylesheets/performance_bar.scss
index 2e2ab8532d2..59fdbf31fe9 100644
--- a/app/assets/stylesheets/performance_bar.scss
+++ b/app/assets/stylesheets/performance_bar.scss
@@ -1,4 +1,5 @@
@import 'framework/variables';
+@import 'framework/variables_overrides';
@import 'peek/views/rblineprof';
#js-peek {
@@ -6,7 +7,7 @@
left: 0;
top: 0;
width: 100%;
- z-index: 1039;
+ z-index: #{$zindex-modal-backdrop + 1};
height: $performance-bar-height;
background: $black;
diff --git a/changelogs/unreleased/50552-unable-to-close-performance-bar.yml b/changelogs/unreleased/50552-unable-to-close-performance-bar.yml
new file mode 100644
index 00000000000..e3619149d2a
--- /dev/null
+++ b/changelogs/unreleased/50552-unable-to-close-performance-bar.yml
@@ -0,0 +1,5 @@
+---
+title: Fix performance bar modal position
+merge_request: 21577
+author:
+type: fixed