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
4d5d8a81
Commit
4d5d8a81
authored
Nov 16, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix total_time template
parent
2fc9b5a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
19 deletions
+10
-19
app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6
...ts/cycle_analytics/components/total_time_component.js.es6
+5
-17
app/assets/stylesheets/pages/cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+5
-2
No files found.
app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6
View file @
4d5d8a81
...
@@ -6,23 +6,11 @@
...
@@ -6,23 +6,11 @@
time: Object,
time: Object,
},
},
template: `
template: `
<span>
<span class="total-time">
<span class="days" v-if="time.days">
<template v-if="time.days">{{ time.days }} <span>{{ time.days === 1 ? 'day' : 'days' }}</span></template>
{{ time.days }}
<template v-if="time.hours">{{ time.hours }} <span>hr</span></template>
<abbr title="Days">{{ time.days === 1 ? 'day' : 'days' }}</abbr>
<template v-if="time.mins">{{ time.mins }} <span>mins</span></template>
</span>
<!-- <template v-if="time.seconds">{{ time.seconds }} <span>s</span></template> -->
<span class="hours" v-if="time.hours">
{{ time.hours }}
<abbr title="Hours">hr</abbr>
</span>
<span class="mins" v-if="time.mins">
{{ time.mins }}
<abbr title="Minutes">mins</abbr>
</span>
<span class="seconds hide" v-if="time.seconds">
{{ time.seconds }}
<abbr title="Seconds">s</abbr>
</span>
</span>
</span>
`,
`,
});
});
...
...
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
4d5d8a81
...
@@ -306,12 +306,15 @@
...
@@ -306,12 +306,15 @@
.item-time
{
.item-time
{
width
:
25%
;
width
:
25%
;
text-align
:
right
;
text-align
:
right
;
}
.total-time
{
font-size
:
$cycle-analytics-big-font
;
font-size
:
$cycle-analytics-big-font
;
color
:
$cycle-analytics-dark-text
;
color
:
$cycle-analytics-dark-text
;
abbr
{
span
{
font-size
:
$gl-font-size
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
font-size
:
$gl-font-size
;
}
}
}
}
...
...
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