diff options
author | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-06-05 18:32:22 +0300 |
---|---|---|
committer | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-06-06 12:28:13 +0300 |
commit | 6b72c2ff34e43a7bc1269c2459057e8817ef3595 (patch) | |
tree | 56ee55a507144f8b5c4508318dc2c3d53f327b7d /app/views/admin/appearances/_form.html.haml | |
parent | 29598f6e6d8ebbe9c1b64018fcb925655ccceb67 (diff) |
move favicon admin section up
Diffstat (limited to 'app/views/admin/appearances/_form.html.haml')
-rw-r--r-- | app/views/admin/appearances/_form.html.haml | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml index ac92b043074..94db374040c 100644 --- a/app/views/admin/appearances/_form.html.haml +++ b/app/views/admin/appearances/_form.html.haml @@ -18,6 +18,25 @@ .hint Maximum file size is 1MB. Pages are optimized for a 28px tall header logo + %fieldset.app_logo + %legend + Favicon: + .form-group.row + = f.label :favicon, 'Favicon', class: 'col-sm-2 col-form-label' + .col-sm-10 + - if @appearance.favicon? + = image_tag @appearance.favicon.favicon_main.url, class: 'appearance-light-logo-preview' + - if @appearance.persisted? + %br + = link_to 'Remove favicon', favicon_admin_appearances_path, data: { confirm: "Favicon will be removed. Are you sure?"}, method: :delete, class: "btn btn-inverted btn-remove btn-sm remove-logo" + %hr + = f.hidden_field :favicon_cache + = f.file_field :favicon, class: '' + .hint + Maximum file size is 1MB. Allowed image formats are #{favicon_extension_whitelist}. + %br + The resulting favicons will be cropped to be square and scaled down to a size of 32x32 px. + %fieldset.sign-in %legend Sign in/Sign up pages: @@ -55,25 +74,6 @@ .hint Guidelines parsed with #{link_to "GitLab Flavored Markdown", help_page_path('user/markdown'), target: '_blank'}. - %fieldset.app_logo - %legend - Favicon: - .form-group - = f.label :favicon, 'Favicon', class: 'control-label' - .col-sm-10 - - if @appearance.favicon? - = image_tag @appearance.favicon.favicon_main.url, class: 'appearance-light-logo-preview' - - if @appearance.persisted? - %br - = link_to 'Remove favicon', favicon_admin_appearances_path, data: { confirm: "Favicon will be removed. Are you sure?"}, method: :delete, class: "btn btn-inverted btn-remove btn-sm remove-logo" - %hr - = f.hidden_field :favicon_cache - = f.file_field :favicon, class: '' - .hint - Maximum file size is 1MB. Allowed image formats are #{favicon_extension_whitelist}. - %br - The resulting favicons will be cropped to be square and scaled down to a size of 32x32 px. - .form-actions = f.submit 'Save', class: 'btn btn-save append-right-10' - if @appearance.persisted? |