Merge branch 'ocd-triggered' into 'develop'

achieve the perfect speeeeen in media-upload

See merge request pleroma/pleroma-fe!991
This commit is contained in:
kaniini 2019-11-11 19:51:05 +00:00
commit 3dae1cf396
2 changed files with 18 additions and 14 deletions

View File

@ -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>

View File

@ -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 {