diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-16 02:28:11 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-16 02:28:11 +0000 |
| commit | f733d4f8979a7570a9347186dbe0f8c663c2ff4f (patch) | |
| tree | 9bb2350e34f0a8c62216c00bb3b0ffaf255e9498 | |
| parent | 958c047516e182dfc52317f721f696e8a1ee85ed (diff) | |
| parent | 1983d1a5ffdbf75763eccb122ac4a30b3b822ea7 (diff) | |
| download | gitlab-ce-f733d4f8979a7570a9347186dbe0f8c663c2ff4f.tar.gz | |
Merge branch '47610-bs4-mini-graph-dropdown-sometimes-open-on-the-top' into 'master'
Resolve "BS4: Mini graph dropdown sometimes open on the top"
Closes #47610
See merge request gitlab-org/gitlab-ce!19912
| -rw-r--r-- | app/assets/javascripts/pipelines/components/stage.vue | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipelines/components/stage.vue b/app/assets/javascripts/pipelines/components/stage.vue index 4dd2fb9fbed..b9231c002fd 100644 --- a/app/assets/javascripts/pipelines/components/stage.vue +++ b/app/assets/javascripts/pipelines/components/stage.vue @@ -165,6 +165,7 @@ export default { class="mini-pipeline-graph-dropdown-toggle js-builds-dropdown-button" data-placement="top" data-toggle="dropdown" + data-display="static" type="button" aria-haspopup="true" aria-expanded="false" diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 4e1768f556a..52332ac97dd 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -1001,7 +1001,7 @@ button.mini-pipeline-graph-dropdown-toggle { /** * Center dropdown menu in mini graph */ - &.dropdown-menu { + .dropdown &.dropdown-menu { transform: translate(-80%, 0); @media (min-width: map-get($grid-breakpoints, md)) { |