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-02 11:57:52 +0200
committerGitHub <noreply@github.com>2018-08-02 11:57:52 +0200
commitcf0f8eb742f1e5a7b0bbab261214ee5e9b9de6fe (patch)
tree29c156a7d145f2ec88e4bb708d329202598bdf35 /app/views/admin/settings/edit.html.haml
parent71b318dedc5f39382cb15250417429427a69166b (diff)
parentbf1d3ae3b83726816c78ca6cb40af24d48390bd9 (diff)
Merge pull request #621 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 f5c5deca8..fda6b00f4 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -7,7 +7,8 @@
 
   .fields-group
     = f.input :site_title, placeholder: t('admin.settings.site_title')
-    = f.input :site_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description.title'), hint: t('admin.settings.site_description.desc_html'), input_html: { rows: 8 }
+    = f.input :site_short_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_short_description.title'), hint: t('admin.settings.site_short_description.desc_html'), input_html: { rows: 2 }
+    = f.input :site_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description.title'), hint: t('admin.settings.site_description.desc_html'), input_html: { rows: 4 }
     = f.input :site_contact_username, placeholder: t('admin.settings.contact_information.username')
     = f.input :site_contact_email, placeholder: t('admin.settings.contact_information.email')