Merge branch '35209-add-wip-info-new-nav-pref' into 'master'

35209 Add wip message to new navigation preference section

Closes #35209

See merge request !12943

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;
+  }
+}

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? }

changelogs/unreleased/35209-add-wip-info-new-nav-pref.yml

+---
+title: Add wip message to new navigation preference section
+merge_request:
+author: