summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Rose <sam@gitlab.com>2017-02-08 11:13:33 -0500
committerSam Rose <sam@gitlab.com>2017-02-08 11:13:33 -0500
commitdff411d7372b9ec59575268885a48004942de2e4 (patch)
tree895849d0992bc69e22dd61645cf06d27d248e0d6
parent4490a57fb06ebb7977e541e8fd6c1c05018b11b5 (diff)
downloadgitlab-ce-fix/cycle-analytics-events-limit.tar.gz
Fix display logic for warning messagefix/cycle-analytics-events-limit
-rw-r--r--app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es62
-rw-r--r--app/assets/stylesheets/pages/cycle_analytics.scss6
2 files changed, 4 insertions, 4 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 3c415636c7f..8652479e7bf 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,7 +13,7 @@
<div>
<div class="events-description">
{{ stage.description }}
- <span v-if="items.length <= 50" class="pull-right">
+ <span v-if="items.length === 50" class="events-info pull-right">
<i class="fa fa-warning has-tooltip"
title="Limited to showing 50 events at most"
data-placement="top"></i>
diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss
index c35562753b5..5b777953fb0 100644
--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -285,10 +285,10 @@
.events-description {
line-height: 65px;
padding: 0 $gl-padding;
+ }
- span {
- color: $gl-text-color-secondary;
- }
+ .events-info {
+ color: $gl-text-color-secondary;
}
}