Commit a4014a4c authored by Kushal Pandya's avatar Kushal Pandya Committed by Filipa Lacerda

Refine MR widget styling for buttons and info text

parent c19d58de
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
<div class="ci-widget"> <div class="ci-widget">
<div class="ci-status-icon ci-status-icon-success"> <div class="ci-status-icon ci-status-icon-success">
<span class="js-icon-link icon-link"> <span class="js-icon-link icon-link">
<span <span class="ci-status-icon"
v-html="svg" v-html="svg"
aria-hidden="true"></span> aria-hidden="true"></span>
</span> </span>
......
...@@ -33,7 +33,7 @@ export default { ...@@ -33,7 +33,7 @@ export default {
return this.useCommitMessageWithDescription ? withoutDesc : withDesc; return this.useCommitMessageWithDescription ? withoutDesc : withDesc;
}, },
mergeButtonClass() { 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 failedClass = `${defaultClass} btn-danger`;
const inActionClass = `${defaultClass} btn-info`; const inActionClass = `${defaultClass} btn-info`;
const { pipeline, isPipelineActive, isPipelineFailed, hasCI, ciStatus } = this.mr; const { pipeline, isPipelineActive, isPipelineFailed, hasCI, ciStatus } = this.mr;
......
...@@ -216,6 +216,16 @@ ...@@ -216,6 +216,16 @@
} }
} }
.mr-widget-body {
.btn {
font-size: 15px;
}
.btn-group .btn {
padding: 5px 10px;
}
}
.mr-widget-body { .mr-widget-body {
h4 { h4 {
font-weight: 600; font-weight: 600;
...@@ -248,6 +258,7 @@ ...@@ -248,6 +258,7 @@
.bold { .bold {
margin-left: 5px; margin-left: 5px;
font-weight: bold; font-weight: bold;
font-size: 15px;
color: $gl-gray-light; color: $gl-gray-light;
} }
...@@ -271,6 +282,11 @@ ...@@ -271,6 +282,11 @@
margin-bottom: 24px; margin-bottom: 24px;
} }
.spacing,
.bold {
vertical-align: middle;
}
.dropdown-menu { .dropdown-menu {
li a { li a {
padding: 5px; padding: 5px;
......
...@@ -80,7 +80,7 @@ describe('MRWidgetReadyToMerge', () => { ...@@ -80,7 +80,7 @@ describe('MRWidgetReadyToMerge', () => {
}); });
describe('mergeButtonClass', () => { 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 failedClass = `${defaultClass} btn-danger`;
const inActionClass = `${defaultClass} btn-info`; const inActionClass = `${defaultClass} btn-info`;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment