Skip to content

Commit 90f6f2c

Browse files
committed
Fix content comment widget on mobile
Fixes #1295 Fixes #1294
1 parent 79193c2 commit 90f6f2c

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

Tekst-Web/src/components/browse/ContentContainerHeaderWidget.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ defineProps<{
88
disabled?: boolean;
99
full?: boolean;
1010
toggled?: boolean;
11+
highlight?: boolean;
1112
}>();
1213
</script>
1314

@@ -18,6 +19,7 @@ defineProps<{
1819
:type="toggled ? 'primary' : undefined"
1920
:block="full"
2021
:circle="!full"
22+
:color="highlight && !toggled ? 'var(--error-color)' : undefined"
2123
:focusable="false"
2224
:title="!full ? title : undefined"
2325
:disabled="disabled"

Tekst-Web/src/components/browse/ContentHeaderWidgets.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,12 @@ function handleSmallScreenWidgetsTriggered() {
9898
<!-- generic content widgets -->
9999
<location-content-context-widget :resource="resource" full @done="closeModal" />
100100
<correction-note-widget :resource="resource" full @done="closeModal" />
101-
<content-comment-widget :resource="resource" full @done="closeModal" />
101+
<content-comment-widget
102+
v-model:show-comments="showComments"
103+
:resource="resource"
104+
full
105+
@done="closeModal"
106+
/>
102107
<content-edit-widget :resource="resource" full @done="closeModal" />
103108
<resource-settings-widget :resource="resource" full @done="closeModal" />
104109
<jump-to-content-widget :resource="resource" direction="before" full @done="closeModal" />

Tekst-Web/src/components/resource/ContentCommentWidget.vue

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import type { AnyResourceRead } from '@/api';
33
import ContentContainerHeaderWidget from '@/components/browse/ContentContainerHeaderWidget.vue';
44
import { CommentIcon } from '@/icons';
5-
import { NBadge } from 'naive-ui';
65
import { computed } from 'vue';
76
87
const props = defineProps<{
@@ -25,18 +24,18 @@ const hasComments = computed(
2524
</script>
2625

2726
<template>
28-
<n-badge v-if="hasComments" :show="!showComments" dot :offset="[-5, 10]">
29-
<content-container-header-widget
30-
:full="full"
31-
:title="$t('common.comment', 2)"
32-
:icon-component="CommentIcon"
33-
:toggled="showComments"
34-
@click="
35-
() => {
36-
showComments = !showComments;
37-
emit('done');
38-
}
39-
"
40-
/>
41-
</n-badge>
27+
<content-container-header-widget
28+
v-if="hasComments"
29+
:full="full"
30+
:title="$t('common.comment', 2)"
31+
:icon-component="CommentIcon"
32+
:toggled="showComments"
33+
:highlight="hasComments && !showComments"
34+
@click="
35+
() => {
36+
showComments = !showComments;
37+
emit('done');
38+
}
39+
"
40+
/>
4241
</template>

0 commit comments

Comments
 (0)