hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into birthdays

Browse source
This commit is contained in:
tusooa 2023-01-22 09:34:01 -05:00
commit b1e75c25bd
No known key found for this signature in database
GPG key ID: 7B467EDE43A08224
300 changed files with 13879 additions and 9055 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/user_profile/user_profile.vue
View file

@ -10,6 +10,7 @@
:selected="timeline.viewing"
avatar-action="zoom"
rounded="top"
:has-note-editor="true"
/>
<span
v-if="!!user.birthday"
@ -149,7 +150,7 @@
<script src="./user_profile.js"></script>
<style lang="scss">
@import '../../_variables.scss';
@import "../../variables";
.user-profile {
flex: 2;
@ -199,7 +200,8 @@
margin: 0 0 0 0.25em;
}
.user-profile-field-name, .user-profile-field-value {
.user-profile-field-name,
.user-profile-field-value {
line-height: 1.3;
text-overflow: ellipsis;
white-space: nowrap;
@ -217,6 +219,7 @@
padding: 2em;
}
}
.user-profile-placeholder {
.panel-body {
display: flex;