diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-14 01:47:06 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-14 01:47:19 -0700 |
| commit | 9b445c683657a85a090af69b12545b657fe5f616 (patch) | |
| tree | 25f76e0ab98bfb49aeeb2eac414e09bab5292b04 | |
| parent | f311e189d5449f6118fc84746c62e33585e4c39c (diff) | |
| download | gitlab-ce-9b445c683657a85a090af69b12545b657fe5f616.tar.gz | |
Return some merge widget styles and make it more compact
| -rw-r--r-- | app/assets/stylesheets/base/gl_bootstrap.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 11 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 2 |
3 files changed, 9 insertions, 9 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 { diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index fb2c3220b8a..9f51f84d400 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/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 |