Commit 9b445c68 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Return some merge widget styles and make it more compact

parent f311e189
......@@ -187,6 +187,11 @@
}
}
.panel-succes .panel-heading,
.panel-info .panel-heading,
.panel-danger .panel-heading,
.panel-warning .panel-heading,
.panel-primary .panel-heading,
.alert {
a {
@extend .alert-link;
......
......@@ -12,14 +12,8 @@
}
.accept-merge-holder {
margin-top: 5px;
.accept-action {
display: inline-block;
.accept_merge_request {
padding: 10px 20px;
}
}
.accept-control {
......@@ -123,10 +117,11 @@
}
.mr-state-widget {
background: $background-color;
font-size: 13px;
background: #F9F9F9;
margin-bottom: 20px;
color: #666;
border: 1px solid $border-color;
border: 1px solid #EEE;
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.09));
.ci_widget {
......
......@@ -30,7 +30,7 @@
text: @merge_request.merge_commit_message,
rows: 14, hint: true
%hr
%br
.light
If you still want to merge this request manually - use
%strong
......
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