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
Boxiang Sun
gitlab-ce
Commits
8c0c4750
Commit
8c0c4750
authored
Jun 19, 2018
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added styling for milestone progress
parent
44c82ebb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+0
-1
app/assets/stylesheets/pages/milestone.scss
app/assets/stylesheets/pages/milestone.scss
+7
-0
app/views/shared/milestones/_milestone.html.haml
app/views/shared/milestones/_milestone.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/common.scss
View file @
8c0c4750
...
@@ -267,7 +267,6 @@ li.note {
...
@@ -267,7 +267,6 @@ li.note {
}
}
.progress
{
.progress
{
margin-bottom
:
0
;
margin-top
:
4px
;
margin-top
:
4px
;
box-shadow
:
none
;
box-shadow
:
none
;
background-color
:
$border-gray-light
;
background-color
:
$border-gray-light
;
...
...
app/assets/stylesheets/pages/milestone.scss
View file @
8c0c4750
...
@@ -23,6 +23,13 @@
...
@@ -23,6 +23,13 @@
.progress
{
.progress
{
width
:
100%
;
width
:
100%
;
height
:
6px
;
height
:
6px
;
margin-bottom
:
$gl-padding-4
;
}
.milestone-progress
{
a
{
color
:
$gl-link-color
;
}
}
}
}
}
}
}
...
...
app/views/shared/milestones/_milestone.html.haml
View file @
8c0c4750
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
.col-sm-6
.col-sm-6
%strong
=
link_to
truncate
(
milestone
.
title
,
length:
100
),
milestone_path
%strong
=
link_to
truncate
(
milestone
.
title
,
length:
100
),
milestone_path
-
unless
dashboard
-
unless
dashboard
=
milestone_type
=
" -
#{
milestone_type
}
"
-
if
@project
||
milestone
.
is_a?
(
GlobalMilestone
)
||
milestone
.
group_milestone?
-
if
@project
||
milestone
.
is_a?
(
GlobalMilestone
)
||
milestone
.
group_milestone?
=
render
(
'shared/milestone_expired'
,
milestone:
milestone
)
=
render
(
'shared/milestone_expired'
,
milestone:
milestone
)
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
%span
.badge.badge-gray
%span
.badge.badge-gray
=
dashboard
?
milestone
.
project
.
full_name
:
milestone
.
project
.
name
=
dashboard
?
milestone
.
project
.
full_name
:
milestone
.
project
.
name
.col-sm-4
.col-sm-4
.milestone-progress
=
milestone_progress_bar
(
milestone
)
=
milestone_progress_bar
(
milestone
)
=
link_to
pluralize
(
milestone
.
total_issues_count
(
current_user
),
'Issue'
),
issues_path
=
link_to
pluralize
(
milestone
.
total_issues_count
(
current_user
),
'Issue'
),
issues_path
·
·
...
...
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