Merge branch 'post-polish-fixes' into 'develop'

Post polish fixes

See merge request pleroma/pleroma-fe!333
This commit is contained in:
kaniini 2018-09-09 11:59:49 +00:00
commit ed6abeacad
8 changed files with 54 additions and 36 deletions

View file

@ -248,6 +248,7 @@ nav {
justify-content: center;
flex: 0 0 auto;
z-index: -1;
.mask {
mask-repeat: no-repeat;
mask-position: center;
@ -260,7 +261,10 @@ nav {
left: 0;
right: 0;
}
img {
height: 100%;
object-fit: contain;
display: block;
flex: 0;
}
@ -325,18 +329,35 @@ main-router {
background-size: cover;
padding: .6em .6em;
text-align: left;
font-size: 1.3em;
line-height: 24px;
line-height: 28px;
background-color: $fallback--btn;
background-color: var(--btn, $fallback--btn);
align-items: baseline;
.title {
flex: 1 0 auto;
font-size: 1.3em;
}
.alert {
white-space: nowrap;
text-overflow: ellipsis;
overflow-x: hidden;
}
button {
height: 100%;
flex-shrink: 0;
}
button, .alert {
// height: 100%;
line-height: 21px;
min-height: 0;
box-sizing: border-box;
margin: 0;
margin-left: .25em;
min-width: 1px;
align-self: stretch;
}
}

View file

@ -3,7 +3,7 @@
<div class="panel-heading conversation-heading">
<span class="title"> {{ $t('timeline.conversation') }} </span>
<span v-if="collapsable">
<small><a href="#" @click.prevent="$emit('toggleExpanded')">{{ $t('timeline.collapse') }}</a></small>
<a href="#" @click.prevent="$emit('toggleExpanded')">{{ $t('timeline.collapse') }}</a>
</span>
</div>
<div class="panel-body">

View file

@ -22,10 +22,6 @@
}
.loadmore-error {
min-width: 6em;
text-align: center;
padding: 0 0.25em 0 0.25em;
margin: 0;
color: $fallback--fg;
color: var(--fg, $fallback--fg);
}

View file

@ -6,21 +6,25 @@ import { filter, trim } from 'lodash'
const settings = {
data () {
const config = this.$store.state.config
return {
hideAttachmentsLocal: this.$store.state.config.hideAttachments,
hideAttachmentsInConvLocal: this.$store.state.config.hideAttachmentsInConv,
hideNsfwLocal: this.$store.state.config.hideNsfw,
notificationVisibilityLocal: this.$store.state.config.notificationVisibility,
replyVisibilityLocal: this.$store.state.config.replyVisibility,
loopVideoLocal: this.$store.state.config.loopVideo,
loopVideoSilentOnlyLocal: this.$store.state.config.loopVideoSilentOnly,
muteWordsString: this.$store.state.config.muteWords.join('\n'),
autoLoadLocal: this.$store.state.config.autoLoad,
streamingLocal: this.$store.state.config.streaming,
pauseOnUnfocusedLocal: this.$store.state.config.pauseOnUnfocused,
hoverPreviewLocal: this.$store.state.config.hoverPreview,
collapseMessageWithSubjectLocal: this.$store.state.config.collapseMessageWithSubject,
stopGifs: this.$store.state.config.stopGifs,
hideAttachmentsLocal: config.hideAttachments,
hideAttachmentsInConvLocal: config.hideAttachmentsInConv,
hideNsfwLocal: config.hideNsfw,
notificationVisibilityLocal: config.notificationVisibility,
replyVisibilityLocal: config.replyVisibility,
loopVideoLocal: config.loopVideo,
loopVideoSilentOnlyLocal: config.loopVideoSilentOnly,
muteWordsString: config.muteWords.join('\n'),
autoLoadLocal: config.autoLoad,
streamingLocal: config.streaming,
pauseOnUnfocusedLocal: config.pauseOnUnfocused,
hoverPreviewLocal: config.hoverPreview,
collapseMessageWithSubjectLocal: typeof config.collapseMessageWithSubject === 'undefined'
? config.defaultCollapseMessageWithSubject
: config.collapseMessageWithSubject,
stopGifs: config.stopGifs,
loopSilentAvailable:
// Firefox
Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||

View file

@ -23,6 +23,7 @@
img {
width: 100%;
height: 100%;
object-fit: contain;
}
&.animated {

View file

@ -4,12 +4,12 @@
<div class="title">
{{title}}
</div>
<button @click.prevent="showNewStatuses" class="loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.show_new')}}{{newStatusCountStr}}
</button>
<div @click.prevent class="loadmore-error alert error" v-if="timelineError">
{{$t('timeline.error_fetching')}}
</div>
<button @click.prevent="showNewStatuses" class="loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.show_new')}}{{newStatusCountStr}}
</button>
<div @click.prevent class="loadmore-text" v-if="!timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.up_to_date')}}
</div>
@ -58,7 +58,6 @@
.timeline {
.loadmore-text {
font-size: 14px;
opacity: 0.8;
background-color: transparent;
color: $fallback--faint;
@ -66,11 +65,6 @@
}
.loadmore-error {
font-size: 14px;
min-width: 6em;
text-align: center;
padding: 0 0.25em 0 0.25em;
margin: 0;
color: $fallback--fg;
color: var(--fg, $fallback--fg);
}

View file

@ -14,8 +14,10 @@
<style lang="scss">
.user-panel {
.profile-panel-background .panel-heading {
background: transparent;
}
.profile-panel-background .panel-heading {
background: transparent;
flex-direction: column;
align-items: stretch;
}
}
</style>

View file

@ -117,7 +117,7 @@ window.fetch('/api/statusnet/config.json')
var showInstanceSpecificPanel = (config.showInstanceSpecificPanel)
var scopeOptionsEnabled = (config.scopeOptionsEnabled)
var formattingOptionsEnabled = (config.formattingOptionsEnabled)
var collapseMessageWithSubject = (config.collapseMessageWithSubject)
var defaultCollapseMessageWithSubject = (config.collapseMessageWithSubject)
store.dispatch('setOption', { name: 'theme', value: theme })
store.dispatch('setOption', { name: 'background', value: background })
@ -127,7 +127,7 @@ window.fetch('/api/statusnet/config.json')
store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
store.dispatch('setOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled })
store.dispatch('setOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject })
store.dispatch('setOption', { name: 'defaultCollapseMessageWithSubject', value: defaultCollapseMessageWithSubject })
if (chatDisabled) {
store.dispatch('disableChat')
}