about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorBen Lubar <ben.lubar+github@gmail.com>2019-02-13 18:04:43 -0600
committerEugen Rochko <eugen@zeonfederated.com>2019-02-14 01:04:43 +0100
commit309043b158f5a4187b6f603f346ed17ee6ddb190 (patch)
tree6c2f826f0095e020dc9ff5e4364e51b3327c90bf /app/javascript
parent80161f43510ad9316c60c9b50dd5c09c2dae4d54 (diff)
Improve image description user experience (#10036)
* Add image descriptions to searchable post content.

* Allow multi-line image descriptions.

* Request image descriptions in the same query as posts when creating the search index.

(see https://github.com/tootsuite/mastodon/pull/10036#discussion_r256551624)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/compose/components/upload.js3
-rw-r--r--app/javascript/styles/mastodon/components.scss2
2 files changed, 2 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/compose/components/upload.js b/app/javascript/mastodon/features/compose/components/upload.js
index 038d7ee28..629cbc36a 100644
--- a/app/javascript/mastodon/features/compose/components/upload.js
+++ b/app/javascript/mastodon/features/compose/components/upload.js
@@ -108,9 +108,8 @@ class Upload extends ImmutablePureComponent {
                 <label>
                   <span style={{ display: 'none' }}>{intl.formatMessage(messages.description)}</span>
 
-                  <input
+                  <textarea
                     placeholder={intl.formatMessage(messages.description)}
-                    type='text'
                     value={description}
                     maxLength={420}
                     onFocus={this.handleInputFocus}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 8533e4eb5..d88557559 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -476,7 +476,7 @@
         opacity: 0;
         transition: opacity .1s ease;
 
-        input {
+        textarea {
           background: transparent;
           color: $secondary-text-color;
           border: 0;