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
87e0fe6f
Unverified
Commit
87e0fe6f
authored
Jun 03, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use big colorful pills for switch between MR tabs
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
7bb0551f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
10 deletions
+6
-10
merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+5
-9
_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/merge_requests.scss
View file @
87e0fe6f
...
...
@@ -20,18 +20,14 @@
}
.merge-request
.merge-request-tabs
{
border-color
:
#AAA
;
border-bottom
:
2px
solid
$border_primary
;
padding-bottom
:
10px
;
margin-bottom
:
20px
;
li
{
a
{
border-color
:
#AAA
;
padding
:
14px
40px
;
padding
:
20px
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 @
87e0fe6f
...
...
@@ -7,7 +7,7 @@
=
render
"projects/merge_requests/show/participants"
-
if
@commits
.
present?
%ul
.nav.nav-
tab
s.merge-request-tabs
%ul
.nav.nav-
pill
s.merge-request-tabs
%li
.notes-tab
{
data:
{
action:
'notes'
}}
=
link_to
project_merge_request_path
(
@project
,
@merge_request
)
do
%i
.icon-comment
...
...
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