Merge remote-tracking branch 'upstream/develop' into neckbeard

2020-10-21 13:36:18 -05:00 · 2020-10-21 13:36:18 -05:00 · 6d8dd2eede
parent b56b9a21d9 9ef4d473cb
commit 6d8dd2eede
2 changed files with 2 additions and 0 deletions
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@ -12,6 +12,7 @@
        <input
          :id="`poll-${index}`"
          v-model="options[index]"
+          size="1"
          class="poll-option-input"
          type="text"
          :placeholder="$t('polls.option')"
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -123,6 +123,7 @@
            type="text"
            :placeholder="$t('post_status.content_warning')"
            :disabled="posting"
+            size="1"
            class="form-post-subject"
          >
        </EmojiInput>