Merge remote-tracking branch 'upstream/develop' into neckbeard
This commit is contained in:
commit
bb29d6c153
|
@ -15,14 +15,14 @@
|
||||||
:emoji="status.emojis"
|
:emoji="status.emojis"
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
v-if="longSubject && showingLongSubject"
|
v-show="longSubject && showingLongSubject"
|
||||||
class="button-unstyled -link tall-subject-hider"
|
class="button-unstyled -link tall-subject-hider"
|
||||||
@click.prevent="toggleShowingLongSubject"
|
@click.prevent="toggleShowingLongSubject"
|
||||||
>
|
>
|
||||||
{{ $t("status.hide_full_subject") }}
|
{{ $t("status.hide_full_subject") }}
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
v-else-if="longSubject"
|
v-show="longSubject && !showingLongSubject"
|
||||||
class="button-unstyled -link tall-subject-hider"
|
class="button-unstyled -link tall-subject-hider"
|
||||||
@click.prevent="toggleShowingLongSubject"
|
@click.prevent="toggleShowingLongSubject"
|
||||||
>
|
>
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
class="text-wrapper"
|
class="text-wrapper"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
v-if="hideTallStatus"
|
v-show="hideTallStatus"
|
||||||
class="button-unstyled -link tall-status-hider"
|
class="button-unstyled -link tall-status-hider"
|
||||||
:class="{ '-focused': focused }"
|
:class="{ '-focused': focused }"
|
||||||
@click.prevent="toggleShowMore"
|
@click.prevent="toggleShowMore"
|
||||||
|
@ -54,7 +54,7 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
v-if="hideSubjectStatus"
|
v-show="hideSubjectStatus"
|
||||||
class="button-unstyled -link cw-status-hider"
|
class="button-unstyled -link cw-status-hider"
|
||||||
@click.prevent="toggleShowMore"
|
@click.prevent="toggleShowMore"
|
||||||
>
|
>
|
||||||
|
@ -85,7 +85,7 @@
|
||||||
/>
|
/>
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
v-if="showingMore && !fullContent"
|
v-show="showingMore && !fullContent"
|
||||||
class="button-unstyled -link status-unhider"
|
class="button-unstyled -link status-unhider"
|
||||||
@click.prevent="toggleShowMore"
|
@click.prevent="toggleShowMore"
|
||||||
>
|
>
|
||||||
|
|
Loading…
Reference in New Issue