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

resolve merge conflicts

Browse source
This commit is contained in:
FloatingGhost 2022-06-08 17:22:45 +01:00 committed by Absturztaube
parent 07d4433e25
commit d2bce51941
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/emoji_reactions/emoji_reactions.vue
View file

@ -22,7 +22,7 @@
{{ reaction.count }}
</span>
<span v-else>
<span class="reaction-emoji">
<span class="reaction-emoji unicode-emoji">
{{ reaction.name }}
</span>
<span>{{ reaction.count }}</span>
@ -50,6 +50,10 @@
flex-wrap: wrap;
}
.unicode-emoji {
font-size: 210%;
}
.emoji-reaction {
padding: 0 0.5em;
margin-right: 0.5em;

20
src/components/settings_modal/tabs/general_tab.vue
View file

@ -110,10 +110,22 @@
</ChoiceSetting>
</li>
<li>
<BooleanSetting
path="alwaysShowNewPostButton"
expert="1"
>
<BooleanSetting path="minimalScopesMode">
{{ $t('settings.minimal_scopes_mode') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="sensitiveByDefault">
{{ $t('settings.sensitive_by_default') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="sensitiveIfSubject">
{{ $t('settings.sensitive_if_subject') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="alwaysShowNewPostButton">
{{ $t('settings.always_show_post_button') }}
</BooleanSetting>
</li>