diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-16 18:05:25 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-21 13:57:10 -0500 |
| commit | 4d5d8a81567f554b5e191aad64a4d461c357385f (patch) | |
| tree | 350cb19add413a0bcc46d63856c3a33bb71cf3fa | |
| parent | 2fc9b5a2f5b4742df356f564dfcdf27c8b3ce9c9 (diff) | |
| download | gitlab-ce-4d5d8a81567f554b5e191aad64a4d461c357385f.tar.gz | |
Fix total_time template
| -rw-r--r-- | app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6 | 22 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/cycle_analytics.scss | 7 |
2 files changed, 10 insertions, 19 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6 index 9d87400dfd8..82b1a00901e 100644 --- a/app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6 +++ b/app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6 @@ -6,23 +6,11 @@ time: Object, }, template: ` - <span> - <span class="days" v-if="time.days"> - {{ time.days }} - <abbr title="Days">{{ time.days === 1 ? 'day' : 'days' }}</abbr> - </span> - <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 class="total-time"> + <template v-if="time.days">{{ time.days }} <span>{{ time.days === 1 ? 'day' : 'days' }}</span></template> + <template v-if="time.hours">{{ time.hours }} <span>hr</span></template> + <template v-if="time.mins">{{ time.mins }} <span>mins</span></template> + <!-- <template v-if="time.seconds">{{ time.seconds }} <span>s</span></template> --> </span> `, }); diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss index a862deb4251..02262b1c613 100644 --- a/app/assets/stylesheets/pages/cycle_analytics.scss +++ b/app/assets/stylesheets/pages/cycle_analytics.scss @@ -306,12 +306,15 @@ .item-time { width: 25%; text-align: right; + } + + .total-time { font-size: $cycle-analytics-big-font; color: $cycle-analytics-dark-text; - abbr { - font-size: $gl-font-size; + span { color: $gl-text-color; + font-size: $gl-font-size; } } |