diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-30 10:11:32 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-30 10:11:32 +0000 |
| commit | 978b4b9cc0374c9cb5680612fe4154f393bbba9c (patch) | |
| tree | e1bfaa62000aeff218e591c8e0845b3be873890f /app | |
| parent | 2f1ef2be6f7d0b28341bfbf533c663b2fcbb7465 (diff) | |
| parent | f41464f878726de7490ea2457060ff0b93dcd138 (diff) | |
| download | gitlab-ce-978b4b9cc0374c9cb5680612fe4154f393bbba9c.tar.gz | |
Merge branch '34990-top-buttons-misaligned' into 'master'
Fixes the margin of the top buttons of the pipeline page
Closes #34990
See merge request !13908
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines.vue | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines.vue index 5df317a76bf..010063a0240 100644 --- a/app/assets/javascripts/pipelines/components/pipelines.vue +++ b/app/assets/javascripts/pipelines/components/pipelines.vue @@ -139,7 +139,9 @@ }; </script> <template> - <div :class="cssClass"> + <div + class="pipelines-container" + :class="cssClass"> <div class="top-area scrolling-tabs-container inner-page-scroll-tabs" v-if="!isLoading && !shouldRenderEmptyState"> diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index a408bde37d6..51656669c98 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -927,3 +927,7 @@ button.mini-pipeline-graph-dropdown-toggle { } } } + +.pipelines-container .top-area .nav-controls > .btn:last-child { + float: none; +} |