diff options
author | Phil Hughes <me@iamphill.com> | 2019-06-10 07:53:00 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-06-10 07:53:00 +0000 |
commit | b7ebcbc06d492a1b3f28424e475f0f13efb114e6 (patch) | |
tree | 8db527fa8feb3eb9b288f1421786419961b3ad67 | |
parent | e3072811475dcd563911a78fce85263b693d3fd6 (diff) | |
parent | b1b54b64dd7a379f5f94ab73354918c09f67aacb (diff) | |
download | gitlab-ce-b7ebcbc06d492a1b3f28424e475f0f13efb114e6.tar.gz |
Merge branch '62144-fix-option-dropdown-button-size' into 'master'
Make option dropdown button to match adjacent button
Closes #62144
See merge request gitlab-org/gitlab-ce!29096
-rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/62144-fix-option-dropdown-button-size.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index ef2777e6601..77ea2c04b28 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -28,7 +28,7 @@ = link_to project_tree_path(@project, @commit), class: "btn btn-default append-right-10 d-none d-sm-none d-md-inline" do #{ _('Browse files') } .dropdown.inline - %a.btn.btn-default.dropdown-toggle.qa-options-button{ data: { toggle: "dropdown" } } + %a.btn.btn-default.dropdown-toggle.qa-options-button.d-md-inline{ data: { toggle: "dropdown" } } %span= _('Options') = icon('caret-down') %ul.dropdown-menu.dropdown-menu-right diff --git a/changelogs/unreleased/62144-fix-option-dropdown-button-size.yml b/changelogs/unreleased/62144-fix-option-dropdown-button-size.yml new file mode 100644 index 00000000000..86d8f4536f9 --- /dev/null +++ b/changelogs/unreleased/62144-fix-option-dropdown-button-size.yml @@ -0,0 +1,5 @@ +--- +title: Fix inconsistent option dropdown button height to match adjacent button +merge_request: 29096 +author: +type: fixed |