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
50df9a7c
Commit
50df9a7c
authored
Feb 20, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor css improvements
* lighter color for comments count * better UI for issue assigee.milestone block
parent
abc65bbb
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
59 additions
and
32 deletions
+59
-32
app/assets/stylesheets/sections/issuable.scss
app/assets/stylesheets/sections/issuable.scss
+16
-0
app/assets/stylesheets/sections/note_form.scss
app/assets/stylesheets/sections/note_form.scss
+1
-1
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+3
-2
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+2
-4
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+1
-1
app/views/projects/issues/_issue_context.html.haml
app/views/projects/issues/_issue_context.html.haml
+13
-7
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_discussion.html.haml
+1
-2
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
app/views/projects/merge_requests/show/_context.html.haml
app/views/projects/merge_requests/show/_context.html.haml
+20
-13
app/views/projects/merge_requests/show/_participants.html.haml
...iews/projects/merge_requests/show/_participants.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/issuable.scss
View file @
50df9a7c
...
...
@@ -23,3 +23,19 @@
}
}
}
.issuable-context-title
{
font-size
:
15px
;
line-height
:
1
.4
;
margin-bottom
:
5px
;
.avatar
{
margin-left
:
0
;
}
label
{
color
:
#666
;
font-weight
:
normal
;
margin-right
:
4px
;
}
}
app/assets/stylesheets/sections/note_form.scss
View file @
50df9a7c
...
...
@@ -169,7 +169,7 @@
color
:
#999
;
background
:
#FFF
;
padding
:
5px
;
margin-top
:
-
7
px
;
margin-top
:
-
11
px
;
border
:
1px
solid
#DDD
;
font-size
:
13px
;
}
app/views/projects/commits/_commit.html.haml
View file @
50df9a7c
...
...
@@ -16,8 +16,9 @@
-
note_count
=
notes
.
count
-
if
note_count
>
0
%span
.label.label-gray
%i
.fa.fa-comment
=
note_count
%span
.light
%i
.fa.fa-comments
=
note_count
-
if
commit
.
description?
.commit-row-description.js-toggle-content
...
...
app/views/projects/issues/_discussion.html.haml
View file @
50df9a7c
...
...
@@ -7,8 +7,7 @@
.row
.col-md-9
.participants
%cite
.cgray
=
pluralize
(
@issue
.
participants
.
count
,
'participant'
)
%span
=
pluralize
(
@issue
.
participants
.
count
,
'participant'
)
-
@issue
.
participants
.
each
do
|
participant
|
=
link_to_member
(
@project
,
participant
,
name:
false
,
size:
24
)
...
...
@@ -20,8 +19,7 @@
=
cross_project_reference
(
@project
,
@issue
)
%hr
.context
%cite
.cgray
=
render
partial:
'issue_context'
,
locals:
{
issue:
@issue
}
=
render
partial:
'issue_context'
,
locals:
{
issue:
@issue
}
%hr
.clearfix
.votes-holder
...
...
app/views/projects/issues/_issue.html.haml
View file @
50df9a7c
...
...
@@ -6,7 +6,7 @@
.issue-title
%span
.str-truncated
=
link_to_gfm
issue
.
title
,
project_issue_path
(
issue
.
project
,
issue
),
class:
"row_title"
.pull-right
.pull-right
.light
-
if
issue
.
closed?
%span
CLOSED
...
...
app/views/projects/issues/_issue_context.html.haml
View file @
50df9a7c
=
form_for
[
@project
,
@issue
],
remote:
true
,
html:
{
class:
'edit-issue inline-update'
}
do
|
f
|
%div
.prepend-top-20
%p
Assignee:
.issuable-context-title
%label
Assignee:
-
if
issue
.
assignee
=
link_to_member
(
@project
,
@issue
.
assignee
)
%strong
=
link_to_member
(
@project
,
@issue
.
assignee
,
size:
24
)
-
else
none
-
if
can?
(
current_user
,
:modify_issue
,
@issue
)
=
project_users_select_tag
(
'issue[assignee_id]'
,
placeholder:
'Select assignee'
,
class:
'custom-form-control js-select2 js-assignee'
,
selected:
@issue
.
assignee_id
)
%div
.prepend-top-20
%p
Milestone:
%div
.prepend-top-20.clearfix
.issuable-context-title
%label
Milestone:
-
if
issue
.
milestone
#{
link_to
@issue
.
milestone
.
title
,
project_milestone_path
(
@project
,
@issue
.
milestone
)
}
%span
.back-to-milestone
=
link_to
project_milestone_path
(
@project
,
@issue
.
milestone
)
do
%strong
%i
.fa.fa-clock-o
=
@issue
.
milestone
.
title
-
else
none
-
if
can?
(
current_user
,
:modify_issue
,
@issue
)
...
...
app/views/projects/merge_requests/_discussion.html.haml
View file @
50df9a7c
...
...
@@ -16,8 +16,7 @@
=
cross_project_reference
(
@project
,
@merge_request
)
%hr
.context
%cite
.cgray
=
render
partial:
'projects/merge_requests/show/context'
,
locals:
{
merge_request:
@merge_request
}
=
render
partial:
'projects/merge_requests/show/context'
,
locals:
{
merge_request:
@merge_request
}
%hr
.votes-holder
%h6
Votes
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
50df9a7c
...
...
@@ -2,7 +2,7 @@
.merge-request-title
%span
.str-truncated
=
link_to_gfm
merge_request
.
title
,
project_merge_request_path
(
merge_request
.
target_project
,
merge_request
),
class:
"row_title"
.pull-right
.pull-right
.light
-
if
merge_request
.
merged?
%span
%i
.fa.fa-check
...
...
app/views/projects/merge_requests/show/_context.html.haml
View file @
50df9a7c
=
form_for
[
@project
,
@merge_request
],
remote:
true
,
html:
{
class:
'edit-merge_request inline-update'
}
do
|
f
|
%div
.prepend-top-20
%p
Assignee:
.issuable-context-title
%label
Assignee:
-
if
@merge_request
.
assignee
=
link_to_member
(
@project
,
@merge_request
.
assignee
)
%strong
=
link_to_member
(
@project
,
@merge_request
.
assignee
,
size:
24
)
-
else
none
-
if
can?
(
current_user
,
:modify_merge_request
,
@merge_request
)
=
project_users_select_tag
(
'merge_request[assignee_id]'
,
placeholder:
'Select assignee'
,
class:
'custom-form-control js-select2 js-assignee'
,
selected:
@merge_request
.
assignee_id
)
.issuable-context-selectbox
-
if
can?
(
current_user
,
:modify_merge_request
,
@merge_request
)
=
project_users_select_tag
(
'merge_request[assignee_id]'
,
placeholder:
'Select assignee'
,
class:
'custom-form-control js-select2 js-assignee'
,
selected:
@merge_request
.
assignee_id
)
%div
.prepend-top-20
%p
Milestone:
%div
.prepend-top-20.clearfix
.issuable-context-title
%label
Milestone:
-
if
@merge_request
.
milestone
%span
.back-to-milestone
#{
link_to
@merge_request
.
milestone
.
title
,
project_milestone_path
(
@project
,
@merge_request
.
milestone
)
}
=
link_to
project_milestone_path
(
@project
,
@merge_request
.
milestone
)
do
%strong
%i
.fa.fa-clock-o
=
@merge_request
.
milestone
.
title
-
else
none
-
if
can?
(
current_user
,
:modify_merge_request
,
@merge_request
)
=
f
.
select
(
:milestone_id
,
milestone_options
(
@merge_request
),
{
include_blank:
"Select milestone"
},
{
class:
'select2 select2-compact js-select2 js-milestone'
})
=
hidden_field_tag
:merge_request_context
=
f
.
submit
class:
'btn'
.issuable-context-selectbox
-
if
can?
(
current_user
,
:modify_merge_request
,
@merge_request
)
=
f
.
select
(
:milestone_id
,
milestone_options
(
@merge_request
),
{
include_blank:
"Select milestone"
},
{
class:
'select2 select2-compact js-select2 js-milestone'
})
=
hidden_field_tag
:merge_request_context
=
f
.
submit
class:
'btn'
app/views/projects/merge_requests/show/_participants.html.haml
View file @
50df9a7c
.participants
%
cite
.cgray
#{
@merge_request
.
participants
.
count
}
participants
%
span
#{
@merge_request
.
participants
.
count
}
participants
-
@merge_request
.
participants
.
each
do
|
participant
|
=
link_to_member
(
@project
,
participant
,
name:
false
,
size:
24
)
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