diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-08-14 15:57:23 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-08-14 15:57:23 -0500 |
| commit | c82f85608a4c7cd5b54e1f63936bbc1f8ee92591 (patch) | |
| tree | 39911cb70bea391af984b5ef7d1f27c49f0bc803 | |
| parent | 2857ed5f68dcd02f20e006180de39263e14a6e36 (diff) | |
| download | gitlab-ce-c82f85608a4c7cd5b54e1f63936bbc1f8ee92591.tar.gz | |
Fix inconsistent spacing for edit buttons on issues and merge request page
| -rw-r--r-- | app/assets/stylesheets/new_nav.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_nav_btns.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss index 795ee91af8b..3e2f23e6b2a 100644 --- a/app/assets/stylesheets/new_nav.scss +++ b/app/assets/stylesheets/new_nav.scss @@ -403,6 +403,7 @@ header.navbar-gitlab-new { } .breadcrumbs-extra { + display: flex; flex: 0 0 auto; margin-left: auto; } diff --git a/app/views/projects/merge_requests/_nav_btns.html.haml b/app/views/projects/merge_requests/_nav_btns.html.haml index e92f2712347..60258a7a39d 100644 --- a/app/views/projects/merge_requests/_nav_btns.html.haml +++ b/app/views/projects/merge_requests/_nav_btns.html.haml @@ -1,5 +1,5 @@ - if @can_bulk_update - = button_tag "Edit Merge Requests", class: "btn js-bulk-update-toggle" + = button_tag "Edit Merge Requests", class: "btn append-right-10 js-bulk-update-toggle" - if merge_project = link_to new_merge_request_path, class: "btn btn-new", title: "New merge request" do New merge request |