diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-22 21:40:01 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-05-22 21:40:01 +0300 |
| commit | 50a00442285973a390fa448d189ee43cd700d668 (patch) | |
| tree | 3058d9894f58784d3ddb162f0942d7072542fea3 /app/assets/javascripts/vue_merge_request_widget/components | |
| parent | b8b0d594941abaf0ce6b996bdcc823ac27407b57 (diff) | |
| parent | 563f67377c0554a21b2f90a251f7787b83e3f447 (diff) | |
Merge branch '32657-fix-mr-widget-styles' into 'master'
MR widget styling fixes
Closes #32657
See merge request !11591
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js index 74613a1089e..d866d4e94b0 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js @@ -210,7 +210,7 @@ export default { v-if="shouldShowMergeOptionsDropdown" :disabled="isMergeButtonDisabled" type="button" - class="btn btn-info dropdown-toggle" + class="btn btn-small btn-info dropdown-toggle" data-toggle="dropdown"> <i class="fa fa-caret-down" |