diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-30 23:04:47 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-30 23:04:47 +0300 |
| commit | 3ed2fce208474face31a6df2dbbdc60b49826238 (patch) | |
| tree | 484f195ed5ef5d042316cd55db77f84c6b9db918 /app | |
| parent | dab9835ae1cd147cb2a25ec3fb262a3f540b2ca8 (diff) | |
| download | gitlab-ce-3ed2fce208474face31a6df2dbbdc60b49826238.tar.gz | |
Style label-branch color
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 10 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 12044db6702..3db6da2a9f9 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -1,6 +1,6 @@ -/** - * MR -> show: Automerge widget + /** + * MR -> show: Automerge widget * */ .automerge_widget { @@ -48,10 +48,10 @@ .label-branch { @include border-radius(4px); - padding: 2px 4px; + padding: 3px 4px; border: none; - background: #555; - color: #fff; + background: $hover; + color: #333; font-family: $monospace_font; font-weight: normal; overflow: hidden; diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 07da20c0e40..563a5244993 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -32,7 +32,9 @@ %span From - if @merge_request.for_fork? %strong.label-branch #{@merge_request.source_project_namespace}:#{@merge_request.source_branch} + %span into + %strong.label-branch #{@merge_request.target_project_namespace}:#{@merge_request.target_branch} - else %strong.label-branch #{@merge_request.source_branch} - %span into - %strong.label-branch #{@merge_request.target_branch} + %span into + %strong.label-branch #{@merge_request.target_branch} |