diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-31 20:32:09 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-31 20:32:09 +0000 |
| commit | ccf9e52e8993e71956479281a3039282099f6e88 (patch) | |
| tree | f3a4c292cef830ba6bd2695bbaaf138acf5292ee | |
| parent | bddde7640e308d57aa94861808204d2ff6241066 (diff) | |
| parent | 4d55be42315238edad4c56d6fc7f8cc9e04e75ed (diff) | |
| download | gitlab-ce-ccf9e52e8993e71956479281a3039282099f6e88.tar.gz | |
Merge branch 'bootstrap-pipeline-right-align' into 'master'
Fix bootstrap pipeline right alignment
Closes #46875
See merge request gitlab-org/gitlab-ce!19284
| -rw-r--r-- | app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue index 7bfe11ab8cd..e64afc94ef9 100644 --- a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue @@ -79,12 +79,13 @@ export default { }; </script> <template> - <div class="ci-job-dropdown-container dropdown"> + <div class="ci-job-dropdown-container dropdown dropright"> <button v-tooltip type="button" data-toggle="dropdown" data-container="body" + data-boundary="viewport" class="dropdown-menu-toggle build-content" :title="tooltipText" > diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index a40f4ea4f4b..4a4da027c92 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -87,7 +87,8 @@ table { display: none; } -.dropdown-toggle::after { +.dropdown-toggle::after, +.dropright .dropdown-menu-toggle::after { // Remove bootstrap's dropdown caret display: none; } |