commit: 3dae1cf39642a677f73d16d3a108f0d88475c36f
parent: 7502ee9734171a2014ef38a90033f4d4db612c80
Author: kaniini <ariadne@dereferenced.org>
Date: Mon, 11 Nov 2019 19:51:05 +0000
Merge branch 'ocd-triggered' into 'develop'
achieve the perfect speeeeen in media-upload
See merge request pleroma/pleroma-fe!991
Diffstat:
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
@@ -6,16 +6,16 @@
@drop="fileDrop"
>
<label
- class="btn btn-default"
+ class="label"
:title="$t('tool_tip.media_upload')"
>
<i
v-if="uploading"
- class="icon-spin4 animate-spin"
+ class="progress-icon icon-spin4 animate-spin"
/>
<i
v-if="!uploading"
- class="icon-upload"
+ class="new-icon icon-upload"
/>
<input
v-if="uploadReady"
@@ -30,15 +30,24 @@
<script src="./media_upload.js" ></script>
-<style>
+<style lang="scss">
.media-upload {
- .icon-upload {
+ .label {
+ display: inline-block;
+ }
+
+ .new-icon {
cursor: pointer;
}
- label {
- display: block;
- width: 100%;
+ .progress-icon {
+ display: inline-block;
+ line-height: 0;
+ &::before {
+ /* Overriding fontello to achieve the perfect speeeen */
+ margin: 0;
+ line-height: 0;
+ }
}
}
-</style>
+ </style>
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
@@ -339,11 +339,6 @@
font-size: 26px;
flex: 1;
- i {
- display: block;
- width: 100%;
- }
-
&.selected, &:hover {
// needs to be specific to override icon default color
i, label {