Commit 27dbc287 authored by Moon Man's avatar Moon Man

Merge branch 'develop' of https://git.pleroma.social/moonman/pleroma-fe into develop

parents 0f824ff3 4ea0db5c
Pipeline #12118 passed with stages
in 4 minutes and 13 seconds
......@@ -625,20 +625,6 @@ nav {
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 {
padding: .5em;
border: 1px solid $fallback--faint;
......
......@@ -54,6 +54,9 @@ const ExtraButtons = {
},
canPin () {
return this.ownStatus && (this.status.visibility === 'public' || this.status.visibility === 'unlisted')
},
enabled () {
return this.canPin || this.canDelete
}
}
}
......
......@@ -3,7 +3,7 @@
trigger="click"
@hide='showDropDown = false'
append-to-body
v-if="showPopper"
v-if="enabled && showPopper"
:options="{
placement: 'top',
modifiers: {
......
......@@ -152,6 +152,7 @@
display: flex;
justify-content: space-between;
flex-direction: row-reverse;
padding-top: 5px;
}
}
......
<template>
<div v-if="!showNothing">
<div v-if="!showNothing" class="scope-selector">
<i class="icon-mail-alt"
:class="css.direct"
:title="$t('post_status.scope.direct')"
......@@ -28,3 +28,19 @@
</template>
<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>
......@@ -6,7 +6,7 @@
<router-link :to="userProfileLink(user)">
<UserAvatar :betterShadow="betterShadow" :user="user"/>
</router-link>
<div class="name-and-screen-name">
<div class="user-summary">
<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-else>{{user.name}}</div>
......@@ -18,12 +18,12 @@
</a>
</div>
<router-link class='user-screen-name' :to="userProfileLink(user)">
<span class="handle">@{{user.screen_name}}
<span class="alert staff" v-if="!hideBio && !!visibleRole">{{visibleRole}}</span>
</span><span v-if="user.locked"><i class="icon icon-lock"></i></span>
<div class="bottom-line">
<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 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>
</router-link>
</div>
</div>
</div>
<div class="user-meta">
......@@ -232,7 +232,7 @@
opacity: .8;
}
.name-and-screen-name {
.user-summary {
display: block;
margin-left: 0.6em;
text-align: left;
......@@ -249,6 +249,7 @@
vertical-align: middle;
object-fit: contain
}
.top-line {
display: flex;
}
......@@ -269,15 +270,19 @@
}
}
.user-screen-name {
color: $fallback--lightText;
color: var(--lightText, $fallback--lightText);
display: inline-block;
.bottom-line {
display: flex;
font-weight: light;
font-size: 15px;
padding-right: 0.1em;
width: 100%;
display: flex;
.user-screen-name {
min-width: 1px;
flex: 0 1 auto;
text-overflow: ellipsis;
overflow: hidden;
color: $fallback--lightText;
color: var(--lightText, $fallback--lightText);
}
.dailyAvg {
min-width: 1px;
......@@ -288,15 +293,9 @@
color: var(--text, $fallback--text);
}
.handle {
min-width: 1px;
flex: 0 1 auto;
text-overflow: ellipsis;
overflow: hidden;
}
// TODO use proper colors
.staff {
flex: none;
text-transform: capitalize;
color: $fallback--text;
color: var(--btnText, $fallback--text);
......
......@@ -251,6 +251,10 @@
margin: 0;
}
.visibility-tray {
padding-top: 5px;
}
input[type=file] {
padding: 5px;
height: auto;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment