BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
d7b3bbfc
Unverified
Commit
d7b3bbfc
authored
May 27, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make MR dicussion and changes tabs more noticable
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
f4889f50
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+11
-4
_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+2
-0
No files found.
app/assets/stylesheets/sections/merge_requests.scss
View file @
d7b3bbfc
...
...
@@ -19,12 +19,19 @@
}
}
.merge-request
.nav-tabs
{
.merge-request
.merge-request-tabs
{
border-color
:
#AAA
;
li
{
a
{
font-weight
:
bold
;
padding
:
8px
20px
;
text-align
:
center
;
border-color
:
#AAA
;
padding
:
14px
40px
;
font-size
:
14px
;
background-color
:
#F9F9F9
;
}
&
.active
a
{
border-color
:
#AAA
;
border-bottom-color
:
#FFF
;
background-color
:
#FFF
;
}
}
}
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
d7b3bbfc
...
...
@@ -12,10 +12,12 @@
=
link_to
project_merge_request_path
(
@project
,
@merge_request
)
do
%i
.icon-comment
Discussion
%span
.badge
=
@merge_request
.
mr_and_commit_notes
.
count
%li
.diffs-tab
{
data:
{
action:
'diffs'
}}
=
link_to
diffs_project_merge_request_path
(
@project
,
@merge_request
)
do
%i
.icon-list-alt
Changes
%span
.badge
=
@merge_request
.
diffs
.
size
-
content_for
:note_actions
do
-
if
can?
(
current_user
,
:modify_merge_request
,
@merge_request
)
...
...
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