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
ff8adc9d
Commit
ff8adc9d
authored
Nov 16, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use slot to use custom_icon helper.
parent
dd1fdc51
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
0 deletions
+7
-0
app/assets/javascripts/issuable_time_tracker.js.es6
app/assets/javascripts/issuable_time_tracker.js.es6
+1
-0
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+4
-0
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+2
-0
No files found.
app/assets/javascripts/issuable_time_tracker.js.es6
View file @
ff8adc9d
...
...
@@ -111,6 +111,7 @@
template: `
<div class='time-tracking-component-wrap' v-cloak>
<div class='sidebar-collapsed-icon'>
<slot name='stopwatch'></slot>
<div class='time-tracking-collapsed-summary'>
<div class='compare' v-if='showComparison'>
<span>{{ abbreviateTime(spentPretty) }} / {{ abbreviateTime(estimatedPretty) }}</span>
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
ff8adc9d
...
...
@@ -409,6 +409,10 @@
}
#issuable-time-tracker
{
>
.stopwatch-svg
{
display
:
none
;
}
.time-tracking-help-state
{
padding
:
10px
0
;
margin-top
:
30px
;
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
ff8adc9d
...
...
@@ -79,6 +79,8 @@
.title.hide-collapsed
Time tracking
=
icon
(
'spinner spin'
)
.stopwatch-svg
{
slot
:'stopwatch'
}
=
custom_icon
(
'icon_stopwatch'
)
-
if
issuable
.
has_attribute?
(
:due_date
)
.block.due_date
.sidebar-collapsed-icon
...
...
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