2d4ff8f6ed
Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Upstream split some `simple_form` arguments across multiple lines. One of the arguments in glitch-soc was different. Split as upstream's did, keeping our different limit argument. - `app/views/admin/settings/appearance/show.html.haml`: Upstream split some `simple_form` arguments across multiple lines. Glitch-soc had a different field because of the different theming system. Kept glitch-soc's definition of that form field.
21 lines
746 B
Text
21 lines
746 B
Text
- content_for :page_title do
|
|
= t('.title')
|
|
|
|
= simple_form_for @custom_emoji, url: admin_custom_emojis_path do |f|
|
|
= render 'shared/error_messages', object: @custom_emoji
|
|
|
|
.fields-group
|
|
= f.input :shortcode,
|
|
wrapper: :with_label,
|
|
label: t('admin.custom_emojis.shortcode'),
|
|
hint: t('admin.custom_emojis.shortcode_hint')
|
|
.fields-group
|
|
= f.input :image,
|
|
wrapper: :with_label,
|
|
input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(',') },
|
|
hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LOCAL_LIMIT))
|
|
|
|
.actions
|
|
= f.button :button,
|
|
t('admin.custom_emojis.upload'),
|
|
type: :submit
|