diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-15 15:44:38 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-15 15:44:38 +0000 |
| commit | 5cfc26867fff4995d16b473d3826ecb338a3d952 (patch) | |
| tree | 9f7f5580c2f400dfe96dd69c0d75456c41badb7c | |
| parent | d8b166846d47fcb394675fe69c0b9006dc2d0f7e (diff) | |
| parent | 35659da185e3c6ec2862884b4e9e19dd20445957 (diff) | |
| download | gitlab-ce-5cfc26867fff4995d16b473d3826ecb338a3d952.tar.gz | |
Merge branch 'fix-btn-alignment' into 'master'
Fix inconsistent spacing for edit buttons on issues and merge request page
Closes #36206
See merge request !13547
| -rw-r--r-- | app/assets/stylesheets/new_nav.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_nav_btns.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-btn-alignment.yml | 5 |
3 files changed, 7 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 436d1aa9e57..e73dab8ad4a 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 diff --git a/changelogs/unreleased/fix-btn-alignment.yml b/changelogs/unreleased/fix-btn-alignment.yml new file mode 100644 index 00000000000..e5dce3d3a0e --- /dev/null +++ b/changelogs/unreleased/fix-btn-alignment.yml @@ -0,0 +1,5 @@ +--- +title: Fix inconsistent spacing for edit buttons on issues and merge request page +merge_request: +author: +type: fixed |