Authored by TaoHuang

Merge remote-tracking branch 'origin/feature/0730/recommend' into feature/topic6.9.9

# Conflicts:
#	apps/pages/article/article-detail.vue
... ... @@ -57,10 +57,8 @@
<DownloadBottom v-if="share" :class="{'scroll-opacity': scrolling}"></DownloadBottom>
<ReplaceToHome :scrolling="scrolling" class="back-to-home"></ReplaceToHome>
<ArticleDetailFooter ref="footer" class="detail-fixed-footer" :style="`transform: translate3d(0, ${viewMoreArticles ? '100%' : '0'}, 0)`" v-bind="footerData" @on-comment-click="onComment">
<template v-slot:fab>
<ReplaceToHome :scrolling="scrolling" class="back-to-home"></ReplaceToHome>
</template>
<template v-if="articleInfo.sort != 2" v-slot:before>
<div class="footer-comment">
<CommentPlaceholder
... ... @@ -528,7 +526,7 @@ export default {
}
.back-to-home {
bottom: 180px;
bottom: 120px;
}
.title-main {
... ...
... ... @@ -337,7 +337,7 @@ export default {
}
.back-to-home {
bottom: 20px;
bottom: 120px;
}
.thumbs {
... ...
<template>
<div class="article-footer-wrapper layout-footer-wrap" :style="actionBarStyle">
<slot name="fab"></slot>
<div class="footer-wrapper-content">
<slot name="before"></slot>
<div class="tool-bar">
... ...
... ... @@ -87,7 +87,7 @@ export default {
}
.back-to-home {
bottom: 20px;
bottom: 120px;
}
.loading {
... ...
... ... @@ -394,7 +394,7 @@ export default {
}
.back-to-home {
bottom: 20px;
bottom: 120px;
}
.publish-btn {
... ...
... ... @@ -501,7 +501,7 @@ export default {
<style lang="scss" scoped>
.back-to-home {
bottom: 40px;
bottom: 120px;
}
.author-page {
... ...