From 3d08a309a5a155bc096bb5812e14e9eb6e57dfab Mon Sep 17 00:00:00 2001
From: tauriedavis <taurie@gitlab.com>
Date: Tue, 18 Jul 2017 09:43:17 -0700
Subject: [PATCH] 35209 Add wip message to new navigation preference section

---
 app/assets/stylesheets/pages/profile.scss         | 15 +++++++++++++++
 app/views/profiles/preferences/show.html.haml     |  6 ++++++
 .../35209-add-wip-info-new-nav-pref.yml           |  4 ++++
 3 files changed, 25 insertions(+)
 create mode 100644 changelogs/unreleased/35209-add-wip-info-new-nav-pref.yml

diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 235c475ff26..22672614e0d 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -376,3 +376,18 @@ table.u2f-registrations {
     }
   }
 }
+
+.nav-wip {
+  border: 1px solid $blue-500;
+  background: $blue-25;
+  padding: $gl-padding;
+  margin-bottom: $gl-padding;
+
+  a {
+    color: $blue-500;
+  }
+
+  p:last-child {
+    margin-bottom: 0;
+  }
+}
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index bd602071384..9aed498a8a0 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -24,6 +24,12 @@
     %p
       This setting allows you to turn on or off the new upcoming navigation concept.
   .col-lg-8.syntax-theme
+    .nav-wip
+      %p
+        The new navigation is currently a work-in-progress concept and is currently only usable on wide-screens. There are a number of improvements that we are working on in order to further refine our navigation.
+      %p
+        %a{ href: 'https://gitlab.com/gitlab-org/gitlab-ce/issues/32794', target: 'blank' } Learn more
+        about the improvements that are coming soon!
     = label_tag do
       .preview= image_tag "old_nav.png"
       %input.js-experiment-feature-toggle{ type: "radio", value: "false", name: "new_nav", checked: !show_new_nav? }
diff --git a/changelogs/unreleased/35209-add-wip-info-new-nav-pref.yml b/changelogs/unreleased/35209-add-wip-info-new-nav-pref.yml
new file mode 100644
index 00000000000..680e1cd8222
--- /dev/null
+++ b/changelogs/unreleased/35209-add-wip-info-new-nav-pref.yml
@@ -0,0 +1,4 @@
+---
+title: Add wip message to new navigation preference section
+merge_request:
+author: