kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Style label-branch color 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-07-30 23:04:47 +03:00
parent dab9835ae1
commit 3ed2fce208
No known key found for this signature in database
GPG Key ID: 627C5F589F467F17
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/sections/merge_requests.scss
View File

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

6
app/views/projects/merge_requests/show/_mr_title.html.haml
View File

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