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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d51f3b7b
Commit
d51f3b7b
authored
Feb 26, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor styles for merge requests list
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
2b5a6487
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
10 deletions
+3
-10
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-8
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
app/views/shared/_merge_requests.html.haml
app/views/shared/_merge_requests.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
d51f3b7b
...
@@ -148,15 +148,8 @@
...
@@ -148,15 +148,8 @@
position
:
relative
;
position
:
relative
;
.merge-request-title
{
.merge-request-title
{
margin-bottom
:
5px
;
margin-bottom
:
2px
;
font-size
:
$list-font-size
;
font-weight
:
600
;
}
.merge-request-info
{
color
:
$gl-gray
;
}
}
}
}
.merge-request-labels
{
.merge-request-labels
{
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
d51f3b7b
%li
{
class:
mr_css_classes
(
merge_request
)
}
%li
{
class:
mr_css_classes
(
merge_request
)
}
.merge-request-title
.merge-request-title
%span
.merge-request-title-text
%span
.merge-request-title-text
=
link_to_gfm
merge_request
.
title
,
merge_request_path
(
merge_request
),
class:
"
row_
title"
=
link_to_gfm
merge_request
.
title
,
merge_request_path
(
merge_request
),
class:
"title"
%ul
.controls.light
%ul
.controls.light
-
if
merge_request
.
merged?
-
if
merge_request
.
merged?
%li
%li
...
...
app/views/shared/_merge_requests.html.haml
View file @
d51f3b7b
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
.pull-right
.pull-right
=
link_to
'New merge request'
,
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
)
=
link_to
'New merge request'
,
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
)
%ul
.
well
-list.mr-list
%ul
.
content
-list.mr-list
-
group
[
1
].
each
do
|
merge_request
|
-
group
[
1
].
each
do
|
merge_request
|
=
render
'projects/merge_requests/merge_request'
,
merge_request:
merge_request
=
render
'projects/merge_requests/merge_request'
,
merge_request:
merge_request
=
paginate
@merge_requests
,
theme:
"gitlab"
=
paginate
@merge_requests
,
theme:
"gitlab"
...
...
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