Skip to content
Snippets Groups Projects
Commit a4014a4c authored by Kushal Pandya's avatar Kushal Pandya Committed by Filipa Lacerda
Browse files

Refine MR widget styling for buttons and info text

parent c19d58de
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -56,7 +56,7 @@ export default {
<div class="ci-widget">
<div class="ci-status-icon ci-status-icon-success">
<span class="js-icon-link icon-link">
<span
<span class="ci-status-icon"
v-html="svg"
aria-hidden="true"></span>
</span>
Loading
Loading
Loading
Loading
@@ -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;
Loading
Loading
Loading
Loading
@@ -216,6 +216,16 @@
}
}
 
.mr-widget-body {
.btn {
font-size: 15px;
}
.btn-group .btn {
padding: 5px 10px;
}
}
.mr-widget-body {
h4 {
font-weight: 600;
Loading
Loading
@@ -248,6 +258,7 @@
.bold {
margin-left: 5px;
font-weight: bold;
font-size: 15px;
color: $gl-gray-light;
}
 
Loading
Loading
@@ -271,6 +282,11 @@
margin-bottom: 24px;
}
 
.spacing,
.bold {
vertical-align: middle;
}
.dropdown-menu {
li a {
padding: 5px;
Loading
Loading
Loading
Loading
@@ -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`;
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment