3 files changed, 9 insertions, 10 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/limit_warning_component.js b/app/assets/javascripts/cycle_analytics/components/limit_warning_component.js
index 6e07560040c..c43a4506755 100644
--- a/app/assets/javascripts/cycle_analytics/components/limit_warning_component.js
+++ b/app/assets/javascripts/cycle_analytics/components/limit_warning_component.js
@@ -6,7 +6,7 @@ export default {
     },
   },
   template: `
-    <span v-if="count === 50 || true" class="events-info pull-right">
+    <span v-if="count === 50" class="events-info pull-right">
       <i class="fa fa-warning has-tooltip"
           aria-hidden="true"
           :title="__('Limited to showing 50 events at most')"
diff --git a/app/assets/javascripts/locale/index.js b/app/assets/javascripts/locale/index.js
index 3907b0e2aba..ca3ed69fbb3 100644
--- a/app/assets/javascripts/locale/index.js
+++ b/app/assets/javascripts/locale/index.js
@@ -13,7 +13,10 @@ const lang = document.querySelector('html').getAttribute('lang') || 'en';
 const locale = new Jed(locales[lang]);
 const gettext = locale.gettext.bind(locale);
 const ngettext = locale.ngettext.bind(locale);
-const pgettext = locale.pgettext.bind(locale);
+const pgettext = (context, key) => {
+  const joinedKey = [context, key].join('|');
+  return gettext(joinedKey).split('|').pop();
+};
 
 export { lang };
 export { gettext as __ };
diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss
index ad3dbc7ac48..182909627bb 100644
--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -213,7 +213,7 @@
     }
 
     .stage-nav-item {
-      display: block;
+      display: flex;
       line-height: 65px;
       border-top: 1px solid transparent;
       border-bottom: 1px solid transparent;
@@ -247,14 +247,10 @@
       }
 
       .stage-nav-item-cell {
-        float: left;
-
-        &.stage-name {
-          width: 65%;
-        }
-
         &.stage-median {
-          width: 35%;
+          margin-left: auto;
+          margin-right: $gl-padding;
+          min-width: calc(35% - #{$gl-padding});
         }
       }