From ffab9d626a41ecb05f8f61f7615005753a0ee060 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Wed, 24 Apr 2019 15:35:27 +0200 Subject: [PATCH] Hide media upload form if no media are attached --- .../features/compose/components/upload_form.js | 12 +++++++----- .../flavours/glitch/styles/components/composer.scss | 6 ++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_form.js b/app/javascript/flavours/glitch/features/compose/components/upload_form.js index a126cc7e4e..4864043a81 100644 --- a/app/javascript/flavours/glitch/features/compose/components/upload_form.js +++ b/app/javascript/flavours/glitch/features/compose/components/upload_form.js @@ -16,11 +16,13 @@ export default class UploadForm extends ImmutablePureComponent {
-
- {mediaIds.map(id => ( - - ))} -
+ {mediaIds.size > 0 && ( +
+ {mediaIds.map(id => ( + + ))} +
+ )}
); } diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss index 466b654de6..c7851b5613 100644 --- a/app/javascript/flavours/glitch/styles/components/composer.scss +++ b/app/javascript/flavours/glitch/styles/components/composer.scss @@ -241,16 +241,14 @@ } .composer--upload_form { - padding: 5px; - color: $inverted-text-color; - background: $simple-background-color; - font-size: 14px; + overflow: hidden; & > .content { display: flex; flex-direction: row; flex-wrap: wrap; font-family: inherit; + padding: 5px; overflow: hidden; } }