From 9644ed82213dcd82bc490b5eb3bd13eaafa740dd Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 3 May 2018 11:26:18 +0100
Subject: [PATCH] updated styling fixed merge request text not always appearing

---
 .../ide/components/editor_mode_dropdown.vue        |  1 -
 .../javascripts/ide/components/ide_review.vue      | 12 +++---------
 app/assets/javascripts/ide/ide_router.js           |  4 ++--
 app/assets/stylesheets/pages/repo.scss             | 14 ++++++++++++++
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/ide/components/editor_mode_dropdown.vue b/app/assets/javascripts/ide/components/editor_mode_dropdown.vue
index e50b1c0315d..fe90d5be063 100644
--- a/app/assets/javascripts/ide/components/editor_mode_dropdown.vue
+++ b/app/assets/javascripts/ide/components/editor_mode_dropdown.vue
@@ -30,7 +30,6 @@ export default {
 <template>
   <div
     class="dropdown"
-    style="margin-left:auto;"
   >
     <button
       type="button"
diff --git a/app/assets/javascripts/ide/components/ide_review.vue b/app/assets/javascripts/ide/components/ide_review.vue
index 230fd094d69..fb0747439c4 100644
--- a/app/assets/javascripts/ide/components/ide_review.vue
+++ b/app/assets/javascripts/ide/components/ide_review.vue
@@ -13,7 +13,9 @@ export default {
     ...mapState(['viewer']),
   },
   mounted() {
-    this.updateViewer(this.currentMergeRequest ? 'mrdiff' : 'diff');
+    this.$nextTick(() => {
+      this.updateViewer(this.currentMergeRequest ? 'mrdiff' : 'diff');
+    });
   },
   methods: {
     ...mapActions(['updateViewer']),
@@ -51,11 +53,3 @@ export default {
     </template>
   </ide-tree-list>
 </template>
-
-<style>
-.ide-review-button-holder {
-  display: flex;
-  width: 100%;
-  align-items: center;
-}
-</style>
diff --git a/app/assets/javascripts/ide/ide_router.js b/app/assets/javascripts/ide/ide_router.js
index f68eb8f4ce6..adca85dc65b 100644
--- a/app/assets/javascripts/ide/ide_router.js
+++ b/app/assets/javascripts/ide/ide_router.js
@@ -102,14 +102,14 @@ router.beforeEach((to, from, next) => {
               throw e;
             });
         } else if (to.params.mrid) {
-          store.dispatch('updateActivityBarView', activityBarViews.review);
-
           store
             .dispatch('getMergeRequestData', {
               projectId: fullProjectId,
               mergeRequestId: to.params.mrid,
             })
             .then(mr => {
+              store.dispatch('updateActivityBarView', activityBarViews.review);
+
               store.dispatch('getBranchData', {
                 projectId: fullProjectId,
                 branchId: mr.source_branch,
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index c47a14a7922..6fa2b7c709b 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -972,6 +972,14 @@
 .ide-review-header {
   flex-direction: column;
   align-items: flex-start;
+
+  .dropdown {
+    margin-left: auto;
+  }
+
+  a {
+    color: $gl-link-color;
+  }
 }
 
 .ide-review-sub-header {
@@ -981,3 +989,9 @@
 .ide-new-modal-label {
   line-height: 34px;
 }
+
+.ide-review-button-holder {
+  display: flex;
+  width: 100%;
+  align-items: center;
+}