diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-07-05 12:01:07 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-07-05 12:01:07 +0000 |
| commit | 491110d633c17b3515756dcacf1666a2ea12fe81 (patch) | |
| tree | 0a6133b13eacdba42338b58af0bddc6d39af8c81 | |
| parent | 519cc029c962278d4d25c9be98a24144d7196733 (diff) | |
| parent | 7e54a6febc492c226740abbf91fd86b1c5b341b7 (diff) | |
| download | gitlab-ce-491110d633c17b3515756dcacf1666a2ea12fe81.tar.gz | |
Merge branch 'new-nav-column-fix' into 'master'
Fixes the column widths for the new navigation option
See merge request !12644
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 2dd938f8379..bd602071384 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -18,12 +18,12 @@ = scheme.name .col-sm-12 %hr - .col-lg-3.profile-settings-sidebar#new-navigation + .col-lg-4.profile-settings-sidebar#new-navigation %h4.prepend-top-0 New Navigation %p This setting allows you to turn on or off the new upcoming navigation concept. - .col-lg-9.syntax-theme + .col-lg-8.syntax-theme = 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? } |