Merge branch 'more-flatly'

app/assets/stylesheets/base/gl_bootstrap.scss

@@ -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;

app/assets/stylesheets/pages/merge_requests.scss

@@ -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 {

app/views/projects/merge_requests/show/_mr_accept.html.haml

@@ -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