diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-10-04 15:08:53 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-10-04 15:08:53 +0000 |
| commit | d2c631285ccb3b8fa244f359a27039dea15fe593 (patch) | |
| tree | 91521e6de5f4df0453e0b711d18ad7e3bfbed9d9 | |
| parent | 867b4f066f362edde126cf8c0132430c3946f2cc (diff) | |
| parent | a18074691a83d75b078d797fb70dcaed7d2e6001 (diff) | |
| download | gitlab-ce-d2c631285ccb3b8fa244f359a27039dea15fe593.tar.gz | |
Merge branch '50552-unable-to-close-performance-bar' into 'master'
Resolve "Unable to close performance bar"
Closes #50552
See merge request gitlab-org/gitlab-ce!21577
| -rw-r--r-- | app/assets/stylesheets/framework/variables_overrides.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/performance_bar.scss | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/50552-unable-to-close-performance-bar.yml | 5 |
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 |