diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-14 11:48:13 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-14 11:48:13 +0300 |
| commit | 19e0dafbef47ca04f19d38b72b817beeb09e8510 (patch) | |
| tree | 42fe2254b308431ee25191b522d8efe7454619e0 /app/assets/stylesheets | |
| parent | 9c7faac0402f26937893ed80b1de06a4f78d6490 (diff) | |
| parent | 9b445c683657a85a090af69b12545b657fe5f616 (diff) | |
Merge branch 'more-flatly'
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/base/gl_bootstrap.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/stylesheets/base/gl_bootstrap.scss b/app/assets/stylesheets/base/gl_bootstrap.scss index 7012d31e318..be1ee90c18f 100644 --- a/app/assets/stylesheets/base/gl_bootstrap.scss +++ b/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; diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 6babb824f3c..d41e34caba1 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/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 { |