diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-18 17:12:55 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-18 17:12:55 +0000 |
| commit | 91374baf8685cc58bb7334ed131bc223ad0875e2 (patch) | |
| tree | a42682ca447f884ca40f205106ea0aaa41fa5081 | |
| parent | 1a3f3777586cdee0578f210b654196027fa6ed8b (diff) | |
| parent | a57125d504d69ca999d86748914c8a9edd50f782 (diff) | |
| download | gitlab-ce-91374baf8685cc58bb7334ed131bc223ad0875e2.tar.gz | |
Merge branch '41806-pipeline-jumping' into 'master'
Resolve "Pipeline stages are jumping when dropdown is open"
Closes #41806
See merge request gitlab-org/gitlab-ce!16556
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_table.vue b/app/assets/javascripts/pipelines/components/pipelines_table.vue index c6638cdcf1e..6681b89e629 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_table.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_table.vue @@ -50,13 +50,13 @@ Pipeline </div> <div - class="table-section section-25 js-pipeline-commit pipeline-commit" + class="table-section section-20 js-pipeline-commit pipeline-commit" role="rowheader" > Commit </div> <div - class="table-section section-15 js-pipeline-stages pipeline-stages" + class="table-section section-20 js-pipeline-stages pipeline-stages" role="rowheader" > Stages diff --git a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue index d87e24cc8a7..d0e4cf7ff40 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue @@ -239,7 +239,7 @@ :auto-devops-help-path="autoDevopsHelpPath" /> - <div class="table-section section-25"> + <div class="table-section section-20"> <div class="table-mobile-header" role="rowheader"> @@ -258,7 +258,7 @@ </div> </div> - <div class="table-section section-wrap section-15 stage-cell"> + <div class="table-section section-wrap section-20 stage-cell"> <div class="table-mobile-header" role="rowheader"> diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 766e02b12ea..db88d4a16b7 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -228,7 +228,7 @@ .stage-cell { &.table-section { @media (min-width: $screen-md-min) { - min-width: 148px; + min-width: 160px; /* Hack alert: Without this the mini graph pipeline won't work properly*/ margin-right: -4px; } } |