diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-09-05 14:20:42 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-09-05 14:20:42 +0000 |
| commit | cce2071cff0bbe1b8b1342c67d32119b7b303067 (patch) | |
| tree | cce2775d8a1028cad739a7447d1d6fe5555e6a87 | |
| parent | 6f48f89e52afd355936241a6701c700bf8c57eb8 (diff) | |
| parent | a5ce3061dd7dda3a84fd545a1eca9786793d4867 (diff) | |
| download | gitlab-ce-cce2071cff0bbe1b8b1342c67d32119b7b303067.tar.gz | |
Merge branch '37331-button-MR-widget' into 'master'
Fix buttons with different height in merge request widget
Closes #37331
See merge request !14000
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/37331-button-MR-widget.yml | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js index c05a76a3b4a..aaca42e3ebc 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js @@ -75,18 +75,20 @@ export default { class="btn btn-small inline"> Check out branch </a> - <span class="dropdown inline prepend-left-10"> + <span class="dropdown prepend-left-10"> <a - class="btn btn-xs dropdown-toggle" + class="btn btn-small inline dropdown-toggle" data-toggle="dropdown" aria-label="Download as" role="button"> <i class="fa fa-download" - aria-hidden="true" /> + aria-hidden="true"> + </i> <i class="fa fa-caret-down" - aria-hidden="true" /> + aria-hidden="true"> + </i> </a> <ul class="dropdown-menu dropdown-menu-align-right"> <li> diff --git a/changelogs/unreleased/37331-button-MR-widget.yml b/changelogs/unreleased/37331-button-MR-widget.yml new file mode 100644 index 00000000000..59bc1bd201e --- /dev/null +++ b/changelogs/unreleased/37331-button-MR-widget.yml @@ -0,0 +1,5 @@ +--- +title: Fix buttons with different height in merge request widget +merge_request: +author: +type: fixed |