Fix button styles on emoji tab

This commit is contained in:
Angelina Filippova 2020-02-20 15:50:59 +03:00
parent 2d0421106a
commit c3fedbf881
3 changed files with 74 additions and 20 deletions

View file

@ -416,7 +416,7 @@ export default {
shortcode: 'Shortcode', shortcode: 'Shortcode',
fallbackSrc: 'Fallback source', fallbackSrc: 'Fallback source',
fallbackSrcSha: 'Fallback source SHA', fallbackSrcSha: 'Fallback source SHA',
savePackMetadata: 'Save pack metadata', saveMetadata: 'Save metadata',
deletePack: 'Delete pack', deletePack: 'Delete pack',
downloadPack: 'Download pack', downloadPack: 'Download pack',
downloadPackArchive: 'Download pack archive', downloadPackArchive: 'Download pack archive',

View file

@ -1,6 +1,6 @@
<template> <template>
<el-collapse-item :title="name" :name="name" class="has-background"> <el-collapse-item :title="name" :name="name" class="has-background">
<el-form v-if="isLocal" label-width="120px" label-position="left" size="small" class="emoji-pack-metadata"> <el-form v-if="isLocal" :label-width="isDesktop ? '120px' : '90px'" label-position="left" size="small" class="emoji-pack-metadata">
<el-form-item :label=" $t('emoji.sharePack')"> <el-form-item :label=" $t('emoji.sharePack')">
<el-switch v-model="share" /> <el-switch v-model="share" />
</el-form-item> </el-form-item>
@ -21,11 +21,13 @@
:label=" $t('emoji.fallbackSrcSha')"> :label=" $t('emoji.fallbackSrcSha')">
{{ pack.pack["fallback-src-sha256"] }} {{ pack.pack["fallback-src-sha256"] }}
</el-form-item> </el-form-item>
<el-form-item class="save-pack-button"> </el-form>
<el-button type="primary" @click="savePackMetadata">{{ $t('emoji.savePackMetadata') }}</el-button> <div class="pack-button-container">
<el-button @click="deletePack">{{ $t('emoji.deletePack') }}</el-button> <div class="save-pack-button-container">
</el-form-item> <el-button type="primary" class="save-pack-button" @click="savePackMetadata">{{ $t('emoji.saveMetadata') }}</el-button>
<el-form-item> <el-button class="delete-pack-button" @click="deletePack">{{ $t('emoji.deletePack') }}</el-button>
</div>
<div class="download-pack-button-container">
<el-link <el-link
v-if="pack.pack['can-download']" v-if="pack.pack['can-download']"
:href="`//${host}/api/pleroma/emoji/packs/${name}/download_shared`" :href="`//${host}/api/pleroma/emoji/packs/${name}/download_shared`"
@ -34,8 +36,8 @@
target="_blank"> target="_blank">
<el-button class="download-archive">{{ $t('emoji.downloadPackArchive') }}</el-button> <el-button class="download-archive">{{ $t('emoji.downloadPackArchive') }}</el-button>
</el-link> </el-link>
</el-form-item> </div>
</el-form> </div>
<el-form v-if="!isLocal" label-width="120px" label-position="left" size="small" class="emoji-pack-metadata"> <el-form v-if="!isLocal" label-width="120px" label-position="left" size="small" class="emoji-pack-metadata">
<el-form-item :label=" $t('emoji.sharePack')"> <el-form-item :label=" $t('emoji.sharePack')">
<el-switch v-model="share" disabled /> <el-switch v-model="share" disabled />
@ -132,6 +134,9 @@ export default {
} }
}, },
computed: { computed: {
isDesktop() {
return this.$store.state.app.device === 'desktop'
},
share: { share: {
get() { return this.pack.pack['share-files'] }, get() { return this.pack.pack['share-files'] },
set(value) { set(value) {
@ -218,9 +223,24 @@ export default {
</script> </script>
<style rel='stylesheet/scss' lang='scss'> <style rel='stylesheet/scss' lang='scss'>
.pack-button-container {
margin: 0 0 18px 120px;
}
.download-archive { .download-archive {
width: 250px width: 250px
} }
.download-pack-button-container {
width: 265px;
.el-link {
width: inherit;
span {
width: inherit;
.download-archive {
width: inherit;
}
}
}
}
.download-shared-pack { .download-shared-pack {
display: flex; display: flex;
margin-bottom: 10px; margin-bottom: 10px;
@ -251,7 +271,38 @@ export default {
.no-background .el-collapse-item__header { .no-background .el-collapse-item__header {
background: white; background: white;
} }
.save-pack-button {
margin-bottom: 5px .save-pack-button-container {
margin-bottom: 8px;
width: 265px;
display: flex;
justify-content: space-between;
}
@media only screen and (max-width:480px) {
.delete-pack-button {
width: 45%;
}
.download-pack-button-container {
width: 100%;
}
.pack-button-container {
width: 100%;
margin: 0 0 22px 0;
}
.save-pack-button {
width: 54%;
}
.save-pack-button-container {
margin-bottom: 8px;
width: 100%;
display: flex;
justify-content: space-between;
button {
padding: 10px 5px;
}
.el-button+.el-button {
margin-left: 3px;
}
}
} }
</style> </style>

View file

@ -1,7 +1,7 @@
<template> <template>
<div class="emoji-packs"> <div class="emoji-packs">
<h1 class="emoji-packs-header">{{ $t('emoji.emojiPacks') }}</h1> <h1 class="emoji-packs-header">{{ $t('emoji.emojiPacks') }}</h1>
<div class="button-container"> <div class="emoji-packs-header-button-container">
<el-button type="primary" class="reload-emoji-button" @click="reloadEmoji">{{ $t('emoji.reloadEmoji') }}</el-button> <el-button type="primary" class="reload-emoji-button" @click="reloadEmoji">{{ $t('emoji.reloadEmoji') }}</el-button>
<el-tooltip :content="$t('emoji.importEmojiTooltip')" effects="dark" placement="bottom" class="import-pack-button"> <el-tooltip :content="$t('emoji.importEmojiTooltip')" effects="dark" placement="bottom" class="import-pack-button">
<el-button type="primary" @click="importFromFS"> <el-button type="primary" @click="importFromFS">
@ -76,7 +76,7 @@ export default {
}, },
labelWidth() { labelWidth() {
if (this.isMobile) { if (this.isMobile) {
return '110px' return '105px'
} else if (this.isTablet) { } else if (this.isTablet) {
return '200px' return '200px'
} else { } else {
@ -140,7 +140,7 @@ export default {
</script> </script>
<style rel='stylesheet/scss' lang='scss'> <style rel='stylesheet/scss' lang='scss'>
.button-container { .emoji-packs-header-button-container {
display: flex; display: flex;
margin: 0 0 22px 15px; margin: 0 0 22px 15px;
} }
@ -175,9 +175,14 @@ export default {
} }
@media only screen and (max-width:480px) { @media only screen and (max-width:480px) {
.button-container { .emoji-packs-header-button-container {
height: 82px; height: 82px;
flex-direction: column; flex-direction: column;
.el-button+.el-button {
margin: 10px 0 0 0;
width: fit-content;
}
} }
.create-pack { .create-pack {
height: 82px; height: 82px;
@ -191,17 +196,15 @@ export default {
} }
.emoji-packs-form { .emoji-packs-form {
margin: 0 10px; margin: 0 10px;
label {
padding-right: 8px;
}
} }
.emoji-packs-header { .emoji-packs-header {
margin: 15px; margin: 15px;
} }
.import-pack-button {
margin: 10px 0 0 0;
width: fit-content;
}
.reload-emoji-button { .reload-emoji-button {
width: fit-content; width: fit-content;
} }
} }
</style> </style>