Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-09-26 16:02:55 +0300
committerAlexis Reigel <mail@koffeinfrei.org>2018-06-05 17:20:18 +0300
commitff24be48556c8a7d8e9a55fc667d0713b90ac591 (patch)
tree6557cf4338d73e108575f20dda2209d54e106dfb /app/views/admin/appearances
parent18d4f121d347bbc91f76b8112f797076864c6b33 (diff)
show avatar status versions on appearance page
Diffstat (limited to 'app/views/admin/appearances')
-rw-r--r--app/views/admin/appearances/_form.html.haml8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml
index 163ce55eb53..8d73bd8fb55 100644
--- a/app/views/admin/appearances/_form.html.haml
+++ b/app/views/admin/appearances/_form.html.haml
@@ -62,7 +62,13 @@
= f.label :favicon, 'Favicon', class: 'control-label'
.col-sm-10
- if @appearance.favicon?
- = image_tag @appearance.favicon.default_without_format_conversion.url, class: 'appearance-light-logo-preview'
+ = image_tag @appearance.favicon.default.url, class: 'appearance-light-logo-preview'
+ - if @appearance.favicon?
+ = f.label :favicon, 'Generated status icons', class: 'control-label'
+ .col-sm-10
+ - if @appearance.favicon?
+ - FaviconUploader::STATUS_ICON_NAMES.each do |status_name|
+ = image_tag @appearance.favicon.public_send(status_name).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-remove btn-sm remove-logo"