diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 16:11:51 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-20 17:17:41 +0300 |
| commit | f3f943cfd2bee56f8c02de002fb178ce3480d900 (patch) | |
| tree | ece3ac162c0cfe074414d32e48b2e833a648eb20 /app/views/admin | |
| parent | 85c10d46ddd5ac2c243251553ce81edc90ee8bb4 (diff) | |
Merge branch 'dz-admin-tabs-dropdown' into 'master'
Move part of admin area navigation from tabs into settings dropdown
Partly fix https://gitlab.com/gitlab-org/gitlab-ce/issues/18799
See merge request !4796
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/appearances/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/application_settings/show.html.haml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/views/admin/appearances/show.html.haml b/app/views/admin/appearances/show.html.haml index 089e8e4cb7a..454b779842c 100644 --- a/app/views/admin/appearances/show.html.haml +++ b/app/views/admin/appearances/show.html.haml @@ -1,7 +1,9 @@ - page_title "Appearance" + %h3.page-title Appearance settings %p.light You can modify the look and feel of GitLab here +%hr = render 'form' diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml index e9c7ca9d5aa..ecc46d86afe 100644 --- a/app/views/admin/application_settings/show.html.haml +++ b/app/views/admin/application_settings/show.html.haml @@ -1,4 +1,5 @@ - page_title "Settings" + %h3.page-title Settings %hr = render 'form' |