about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorBen Lubar <ben.lubar@gmail.com>2019-02-13 12:51:33 -0600
committerThibG <thib@sitedethib.com>2019-02-17 15:19:12 +0100
commitfa9635c7417361104342e9c108c08ed821634167 (patch)
tree8323b5ad25de5a4469d526d06510818d58b53ec1 /app/javascript
parenta2b4b82f0fdcae4757d169c706262926f4e53c6b (diff)
Allow multi-line image descriptions. (Glitch)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/flavours/glitch/features/composer/upload_form/item/index.js3
-rw-r--r--app/javascript/flavours/glitch/styles/components/composer.scss4
2 files changed, 3 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/features/composer/upload_form/item/index.js b/app/javascript/flavours/glitch/features/composer/upload_form/item/index.js
index 93fa4e39e..4f5f66f04 100644
--- a/app/javascript/flavours/glitch/features/composer/upload_form/item/index.js
+++ b/app/javascript/flavours/glitch/features/composer/upload_form/item/index.js
@@ -169,13 +169,12 @@ export default class ComposerUploadFormItem extends React.PureComponent {
               </div>
               <label>
                 <span style={{ display: 'none' }}><FormattedMessage {...messages.description} /></span>
-                <input
+                <textarea
                   maxLength={420}
                   onBlur={handleBlur}
                   onChange={handleChange}
                   onFocus={handleFocus}
                   placeholder={intl.formatMessage(messages.description)}
-                  type='text'
                   value={description}
                 />
               </label>
diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss
index 2267b798c..fa24cabf2 100644
--- a/app/javascript/flavours/glitch/styles/components/composer.scss
+++ b/app/javascript/flavours/glitch/styles/components/composer.scss
@@ -262,7 +262,7 @@
     background-repeat: no-repeat;
     overflow: hidden;
 
-    input {
+    textarea {
       display: block;
       position: absolute;
       box-sizing: border-box;
@@ -294,7 +294,7 @@
 
   &.active {
     & > div {
-      input { opacity: 1 }
+      textarea { opacity: 1 }
     }
   }
 }