From a50cd7e37dce6e95f2c3d6cc63c382af71a2926e Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 21 Oct 2020 00:01:28 +0300 Subject: remaining changes... --- .../post_status_form/post_status_form.js | 6 ++- .../post_status_form/post_status_form.vue | 46 +++++++--------------- 2 files changed, 19 insertions(+), 33 deletions(-) (limited to 'src/components/post_status_form') diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index e763baa8..1bdf9833 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -19,7 +19,8 @@ import { faPollH, faUpload, faBan, - faTimes + faTimes, + faCircleNotch } from '@fortawesome/free-solid-svg-icons' library.add( @@ -28,7 +29,8 @@ library.add( faPollH, faUpload, faBan, - faTimes + faTimes, + faCircleNotch ) const buildMentionsString = ({ user, attentions = [] }, currentUser) => { diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 817b2fa0..428b8560 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -85,9 +85,10 @@ {{ $t('post_status.preview') }} -
Error: {{ error }} -
@@ -295,7 +298,7 @@ :key="file.url" class="media-upload-wrapper" > - @@ -379,10 +382,6 @@ padding-left: 0.5em; display: flex; width: 100%; - - .icon-spin3 { - margin-left: auto; - } } .preview-toggle { @@ -477,7 +476,7 @@ text-align: right; } - .icon-chart-bar { + .poll-icon { cursor: pointer; } @@ -490,19 +489,6 @@ margin-bottom: .5em; width: 18em; - .icon-cancel { - display: inline-block; - position: static; - margin: 0; - padding-bottom: 0; - margin-left: $fallback--attachmentRadius; - margin-left: var(--attachmentRadius, $fallback--attachmentRadius); - background-color: $fallback--fg; - background-color: var(--btn, $fallback--fg); - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - } - img, video { object-fit: contain; max-height: 10em; @@ -525,7 +511,7 @@ flex-direction: column; } - .media-upload-wrapper .attachments { + .attachments .media-upload-wrapper{ padding: 0 0.5em; .attachment { @@ -534,11 +520,14 @@ position: relative; } - i { + .button-icon { position: absolute; margin: 10px; - padding: 5px; + margin: .75em; + padding: .5em; background: rgba(230,230,230,0.6); + z-index: 2; + color: black; border-radius: $fallback--attachmentRadius; border-radius: var(--attachmentRadius, $fallback--attachmentRadius); font-weight: bold; @@ -615,11 +604,6 @@ cursor: not-allowed; } - .icon-cancel { - cursor: pointer; - z-index: 4; - } - @keyframes fade-in { from { opacity: 0; } to { opacity: 0.6; } -- cgit v1.2.3-70-g09d2