diff options
| author | Sam Rose <samrose3@gmail.com> | 2017-02-07 10:41:02 -0500 |
|---|---|---|
| committer | Sam Rose <samrose3@gmail.com> | 2017-02-07 10:46:21 -0500 |
| commit | 8dced28a6630014ae278a3b874ecd922364beddb (patch) | |
| tree | c0360e235fc8548ceb4839fd89f966e553ba0b31 /app | |
| parent | bf05c7e035459cdf554b6d651b57ab82031a6bf3 (diff) | |
| download | gitlab-ce-8dced28a6630014ae278a3b874ecd922364beddb.tar.gz | |
Display number of shown events on Plan stage of Cycle Analytics
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6 | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/cycle_analytics.scss | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6 index 513298ba4e7..b221f7384e6 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6 +++ b/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6 @@ -13,6 +13,11 @@ <div> <div class="events-description"> {{ stage.description }} + <span class="pull-right has-tooltip" + title="Limited to a maximum of 50 events" + data-placement="top"> + Showing {{ items.length }} events + </span> </div> <ul class="stage-event-list"> <li v-for="commit in items" class="stage-event-item"> diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss index cda069e6c0e..c35562753b5 100644 --- a/app/assets/stylesheets/pages/cycle_analytics.scss +++ b/app/assets/stylesheets/pages/cycle_analytics.scss @@ -284,7 +284,11 @@ .events-description { line-height: 65px; - padding-left: $gl-padding; + padding: 0 $gl-padding; + + span { + color: $gl-text-color-secondary; + } } } |