about summary refs log tree commit diff
path: root/app/views/admin/settings/edit.html.haml
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-08-26 13:23:52 +0200
committerGitHub <noreply@github.com>2018-08-26 13:23:52 +0200
commit2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (patch)
tree4c8d12cc031476870a918bec3b3000f899101a32 /app/views/admin/settings/edit.html.haml
parent0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff)
parent246c313d457397f412f9fb5eed3ee02cf5d9a561 (diff)
Merge pull request #671 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/settings/edit.html.haml')
-rw-r--r--app/views/admin/settings/edit.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index fda6b00f4..abe7ecf32 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -15,6 +15,7 @@
   %hr/
 
   .fields-group
+    = f.input :flavour, collection: Themes.instance.flavours, label_method: lambda { |flavour| I18n.t("flavours.#{flavour}.name", default: flavour) }, wrapper: :with_label, include_blank: false
     = f.input :thumbnail, as: :file, wrapper: :with_block_label, label: t('admin.settings.thumbnail.title'), hint: t('admin.settings.thumbnail.desc_html')
     = f.input :hero, as: :file, wrapper: :with_block_label, label: t('admin.settings.hero.title'), hint: t('admin.settings.hero.desc_html')
 
@@ -48,7 +49,7 @@
   .fields-group
     = f.input :site_extended_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description_extended.title'), hint: t('admin.settings.site_description_extended.desc_html'), input_html: { rows: 8 }
     = f.input :site_terms, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_terms.title'), hint: t('admin.settings.site_terms.desc_html'), input_html: { rows: 8 }
-
+    = f.input :custom_css, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }, label: t('admin.settings.custom_css.title'), hint: t('admin.settings.custom_css.desc_html')
   %hr/
 
   .fields-group