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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
31e1a38b
Commit
31e1a38b
authored
Feb 03, 2016
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some refactor for CSS after code review.
parent
5bad3516
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
22 deletions
+30
-22
app/assets/stylesheets/pages/milestone.scss
app/assets/stylesheets/pages/milestone.scss
+24
-19
app/models/milestone.rb
app/models/milestone.rb
+3
-0
app/views/projects/milestones/_issues.html.haml
app/views/projects/milestones/_issues.html.haml
+2
-2
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/milestone.scss
View file @
31e1a38b
...
@@ -12,11 +12,18 @@ li.milestone {
...
@@ -12,11 +12,18 @@ li.milestone {
}
}
}
}
.time-elapsed
{
.milestone-content
{
color
:
#F14539
;
.issues-count
{
}
margin-right
:
17px
;
float
:
right
;
width
:
105px
;
}
.issue-row
.assignee-icon
{
.panel-heading
{
font-weight
:
bold
;
}
.issue-row
.assignee-icon
{
.color-label
{
.color-label
{
float
:
left
;
float
:
left
;
padding
:
8px
;
padding
:
8px
;
...
@@ -26,21 +33,19 @@ li.milestone {
...
@@ -26,21 +33,19 @@ li.milestone {
img
{
img
{
margin-left
:
8px
;
margin-left
:
8px
;
}
}
}
}
}
.milestone-summary
{
.milestone-summary
{
margin-bottom
:
25px
;
margin-bottom
:
25px
;
}
.milestone-stat
{
.milestone-stat
{
margin-right
:
10px
;
margin-right
:
10px
;
}
}
#tab-labels
.issues-count
{
.time-elapsed
{
margin-right
:
17px
;
color
:
$orange-light
;
float
:
right
;
}
width
:
105px
;
}
}
.issues-sortable-list
{
.issues-sortable-list
{
...
...
app/models/milestone.rb
View file @
31e1a38b
...
@@ -110,6 +110,9 @@ class Milestone < ActiveRecord::Base
...
@@ -110,6 +110,9 @@ class Milestone < ActiveRecord::Base
0
0
end
end
# Returns the elapsed time (in percent) since the Milestone creation date until today.
# If the Milestone doesn't have a due_date then returns 0 since we can't calculate the elapsed time.
# If the Milestone is overdue then it returns 100%.
def
percent_time_used
def
percent_time_used
return
0
unless
due_date
return
0
unless
due_date
return
100
if
expired?
return
100
if
expired?
...
...
app/views/projects/milestones/_issues.html.haml
View file @
31e1a38b
.panel.panel-default
.panel.panel-default
.panel-heading
.panel-heading
%strong
=
title
=
title
%strong
.pull-right
=
issues
.
size
.pull-right
=
issues
.
size
%ul
{
class:
"well-list issues-sortable-list"
,
id:
"issues-list-#{id}"
,
"data-state"
=>
id
}
%ul
{
class:
"well-list issues-sortable-list"
,
id:
"issues-list-#{id}"
,
"data-state"
=>
id
}
-
issues
.
sort_by
(
&
:position
).
each
do
|
issue
|
-
issues
.
sort_by
(
&
:position
).
each
do
|
issue
|
=
render
'issue'
,
issue:
issue
=
render
'issue'
,
issue:
issue
app/views/projects/milestones/show.html.haml
View file @
31e1a38b
...
@@ -94,7 +94,7 @@
...
@@ -94,7 +94,7 @@
Labels
Labels
%span
.badge
=
@labels
.
count
%span
.badge
=
@labels
.
count
.tab-content
.tab-content
.milestone-content
.tab-pane.active
#tab-issues
.tab-pane.active
#tab-issues
.row.prepend-top-default
.row.prepend-top-default
.col-md-4
.col-md-4
...
...
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