diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-19 17:08:08 +0000 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-05-19 15:36:19 -0600 |
| commit | 996aa1e67d125a9a93fd7ed335e8352b2a9df09f (patch) | |
| tree | dcd72bc6d8d8a1941e49ce9a18c0857b54fcd4b1 | |
| parent | 8087c70cac3de440cef55fcd64f516736e06b4dc (diff) | |
| download | gitlab-ce-996aa1e67d125a9a93fd7ed335e8352b2a9df09f.tar.gz | |
Merge branch '32595-fix-vertical-misalignment-mr-widget' into 'master'
Refine MR widget styling for buttons and info text
Closes #32595
See merge request !11548
3 files changed, 18 insertions, 2 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 ebcc03e531b..74613a1089e 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 @@ -33,7 +33,7 @@ export default { return this.useCommitMessageWithDescription ? withoutDesc : withDesc; }, mergeButtonClass() { - const defaultClass = 'btn btn-success accept-merge-request'; + const defaultClass = 'btn btn-small btn-success accept-merge-request'; const failedClass = `${defaultClass} btn-danger`; const inActionClass = `${defaultClass} btn-info`; const { pipeline, isPipelineActive, isPipelineFailed, hasCI, ciStatus } = this.mr; diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 2572df0bf25..af084deeaff 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -195,6 +195,16 @@ } .mr-widget-body { + .btn { + font-size: 15px; + } + + .btn-group .btn { + padding: 5px 10px; + } + } + + .mr-widget-body { h4 { font-weight: 600; font-size: 16px; @@ -226,6 +236,7 @@ .bold { margin-left: 5px; font-weight: bold; + font-size: 15px; color: $gl-gray-light; } @@ -249,6 +260,11 @@ margin-bottom: 24px; } + .spacing, + .bold { + vertical-align: middle; + } + .dropdown-menu { li a { padding: 5px; diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js index 74df99415c9..d043ad38b8b 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js @@ -80,7 +80,7 @@ describe('MRWidgetReadyToMerge', () => { }); describe('mergeButtonClass', () => { - const defaultClass = 'btn btn-success accept-merge-request'; + const defaultClass = 'btn btn-small btn-success accept-merge-request'; const failedClass = `${defaultClass} btn-danger`; const inActionClass = `${defaultClass} btn-info`; |