Merge branch '540' into 'develop'

Fix wrong mouse pointer hot zone in the post status box

Closes #540

See merge request pleroma/pleroma-fe!795
This commit is contained in:
HJ 2019-05-19 19:39:19 +00:00
commit 4ea0db5cb1
5 changed files with 42 additions and 36 deletions

View File

@ -625,20 +625,6 @@ nav {
text-align: right; text-align: right;
} }
.visibility-tray {
font-size: 1.2em;
cursor: pointer;
.selected {
color: $fallback--lightText;
color: var(--lightText, $fallback--lightText);
}
div {
padding-top: 5px;
}
}
.visibility-notice { .visibility-notice {
padding: .5em; padding: .5em;
border: 1px solid $fallback--faint; border: 1px solid $fallback--faint;

View File

@ -152,6 +152,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-direction: row-reverse; flex-direction: row-reverse;
padding-top: 5px;
} }
} }

View File

@ -1,5 +1,5 @@
<template> <template>
<div v-if="!showNothing"> <div v-if="!showNothing" class="scope-selector">
<i class="icon-mail-alt" <i class="icon-mail-alt"
:class="css.direct" :class="css.direct"
:title="$t('post_status.scope.direct')" :title="$t('post_status.scope.direct')"
@ -28,3 +28,19 @@
</template> </template>
<script src="./scope_selector.js"></script> <script src="./scope_selector.js"></script>
<style lang="scss">
@import '../../_variables.scss';
.scope-selector {
i {
font-size: 1.2em;
cursor: pointer;
&.selected {
color: $fallback--lightText;
color: var(--lightText, $fallback--lightText);
}
}
}
</style>

View File

@ -6,7 +6,7 @@
<router-link :to="userProfileLink(user)"> <router-link :to="userProfileLink(user)">
<UserAvatar :betterShadow="betterShadow" :user="user"/> <UserAvatar :betterShadow="betterShadow" :user="user"/>
</router-link> </router-link>
<div class="name-and-screen-name"> <div class="user-summary">
<div class="top-line"> <div class="top-line">
<div :title="user.name" class='user-name' v-if="user.name_html" v-html="user.name_html"></div> <div :title="user.name" class='user-name' v-if="user.name_html" v-html="user.name_html"></div>
<div :title="user.name" class='user-name' v-else>{{user.name}}</div> <div :title="user.name" class='user-name' v-else>{{user.name}}</div>
@ -18,12 +18,12 @@
</a> </a>
</div> </div>
<router-link class='user-screen-name' :to="userProfileLink(user)"> <div class="bottom-line">
<span class="handle">@{{user.screen_name}} <router-link class="user-screen-name" :to="userProfileLink(user)">@{{user.screen_name}}</router-link>
<span class="alert staff" v-if="!hideBio && !!visibleRole">{{visibleRole}}</span> <span class="alert staff" v-if="!hideBio && !!visibleRole">{{visibleRole}}</span>
</span><span v-if="user.locked"><i class="icon icon-lock"></i></span> <span v-if="user.locked"><i class="icon icon-lock"></i></span>
<span v-if="!hideUserStatsLocal && !hideBio" class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span> <span v-if="!hideUserStatsLocal && !hideBio" class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span>
</router-link> </div>
</div> </div>
</div> </div>
<div class="user-meta"> <div class="user-meta">
@ -232,7 +232,7 @@
opacity: .8; opacity: .8;
} }
.name-and-screen-name { .user-summary {
display: block; display: block;
margin-left: 0.6em; margin-left: 0.6em;
text-align: left; text-align: left;
@ -249,6 +249,7 @@
vertical-align: middle; vertical-align: middle;
object-fit: contain object-fit: contain
} }
.top-line { .top-line {
display: flex; display: flex;
} }
@ -269,15 +270,19 @@
} }
} }
.user-screen-name { .bottom-line {
color: $fallback--lightText; display: flex;
color: var(--lightText, $fallback--lightText);
display: inline-block;
font-weight: light; font-weight: light;
font-size: 15px; font-size: 15px;
padding-right: 0.1em;
width: 100%; .user-screen-name {
display: flex; min-width: 1px;
flex: 0 1 auto;
text-overflow: ellipsis;
overflow: hidden;
color: $fallback--lightText;
color: var(--lightText, $fallback--lightText);
}
.dailyAvg { .dailyAvg {
min-width: 1px; min-width: 1px;
@ -288,15 +293,9 @@
color: var(--text, $fallback--text); color: var(--text, $fallback--text);
} }
.handle {
min-width: 1px;
flex: 0 1 auto;
text-overflow: ellipsis;
overflow: hidden;
}
// TODO use proper colors // TODO use proper colors
.staff { .staff {
flex: none;
text-transform: capitalize; text-transform: capitalize;
color: $fallback--text; color: $fallback--text;
color: var(--btnText, $fallback--text); color: var(--btnText, $fallback--text);

View File

@ -251,6 +251,10 @@
margin: 0; margin: 0;
} }
.visibility-tray {
padding-top: 5px;
}
input[type=file] { input[type=file] {
padding: 5px; padding: 5px;
height: auto; height: auto;