Commit 19e0dafb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'more-flatly'

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