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
7ecd30a8
Commit
7ecd30a8
authored
Jan 27, 2016
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Align Milestone's issue counter.
parent
2c31ebff
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
7 deletions
+20
-7
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+0
-4
app/assets/stylesheets/pages/milestone.scss
app/assets/stylesheets/pages/milestone.scss
+7
-0
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+13
-3
No files found.
app/assets/stylesheets/pages/labels.scss
View file @
7ecd30a8
...
@@ -19,7 +19,3 @@
...
@@ -19,7 +19,3 @@
.color-label
{
.color-label
{
padding
:
3px
4px
;
padding
:
3px
4px
;
}
}
#tab-labels
.issues-count
{
margin-left
:
30px
;
}
app/assets/stylesheets/pages/milestone.scss
View file @
7ecd30a8
...
@@ -35,3 +35,10 @@ li.milestone {
...
@@ -35,3 +35,10 @@ li.milestone {
.milestone-stat
{
.milestone-stat
{
margin-right
:
10px
;
margin-right
:
10px
;
}
}
#tab-labels
.issues-count
{
margin-right
:
17px
;
float
:
right
;
width
:
105px
;
}
app/views/projects/milestones/show.html.haml
View file @
7ecd30a8
...
@@ -143,10 +143,20 @@
...
@@ -143,10 +143,20 @@
%small
.cgray
=
user
.
username
%small
.cgray
=
user
.
username
.tab-pane
#tab-labels
.tab-pane
#tab-labels
.gray-content-block.middle-block
.pull-right
-
if
can?
(
current_user
,
:create_issue
,
@project
)
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
issue:
{
milestone_id:
@milestone
.
id
}),
class:
"btn btn-grouped"
,
title:
"New Issue"
do
%i
.fa.fa-plus
New Issue
-
if
can?
(
current_user
,
:read_issue
,
@project
)
=
link_to
'Browse Issues'
,
namespace_project_issues_path
(
@milestone
.
project
.
namespace
,
@milestone
.
project
,
milestone_title:
@milestone
.
title
),
class:
"btn btn-grouped"
.oneline
All labels in this milestone
%ul
.bordered-list.manage-labels-list
%ul
.bordered-list.manage-labels-list
-
@labels
.
each
do
|
label
|
-
@labels
.
each
do
|
label
|
%li
%li
=
render_colored_label
(
label
)
=
render_colored_label
(
label
)
.pull-right
%span
.issues-count
=
pluralize
label
.
open_issues_count
,
'open issue'
%span
.issues-count
=
pluralize
label
.
open_issues_count
,
'open issue'
%span
.issues-count
=
pluralize
label
.
closed_issues_count
,
'closed issue'
%span
.issues-count
=
pluralize
label
.
closed_issues_count
,
'closed issue'
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