diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-19 18:17:57 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-19 18:17:57 +0000 |
| commit | d96b14f80a2fb285f2128aabeacc98fbe1f31dc8 (patch) | |
| tree | f3a505896f379895e6773485a7254bb61937cd4a | |
| parent | 606ed6d14d3f4ff15edf1b8d5143bfa6f160dcbc (diff) | |
| parent | 3d08a309a5a155bc096bb5812e14e9eb6e57dfab (diff) | |
| download | gitlab-ce-d96b14f80a2fb285f2128aabeacc98fbe1f31dc8.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 15 | ||||
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/35209-add-wip-info-new-nav-pref.yml | 4 |
3 files changed, 25 insertions, 0 deletions
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: |