Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
3ed2fce2
Commit
3ed2fce2
authored
Jul 30, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style label-branch color
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
dab9835a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+5
-5
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+4
-2
No files found.
app/assets/stylesheets/sections/merge_requests.scss
View file @
3ed2fce2
/**
* MR -> show: Automerge widget
/**
* MR -> show: Automerge widget
*
*/
.automerge_widget
{
...
...
@@ -48,10 +48,10 @@
.label-branch
{
@include
border-radius
(
4px
);
padding
:
2
px
4px
;
padding
:
3
px
4px
;
border
:
none
;
background
:
#555
;
color
:
#
fff
;
background
:
$hover
;
color
:
#
333
;
font-family
:
$monospace_font
;
font-weight
:
normal
;
overflow
:
hidden
;
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
3ed2fce2
...
...
@@ -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
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment