butter/keanu-weblite
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch '353-ux-improvement-edited-text' into 'dev'

Browse source 
Edited text improvement

Closes #353

See merge request keanuapp/keanuapp-weblite!114
This commit is contained in:
N Pex 2022-11-02 14:22:23 +00:00
commit fe150e621f
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "keanuapp-weblite", "name": "keanuapp-weblite",
"version": "0.1.25", "version": "0.1.27",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "keanuapp-weblite", "name": "keanuapp-weblite",
"version": "0.1.25", "version": "0.1.27",
"dependencies": { "dependencies": {
"@matrix-org/olm": "^3.2.12", "@matrix-org/olm": "^3.2.12",
"aes-js": "^3.1.2", "aes-js": "^3.1.2",

3
src/assets/css/chat.scss
View file

@ -486,9 +486,12 @@ $admin-fg: white;
overflow-wrap: break-word; overflow-wrap: break-word;
word-wrap: break-word; word-wrap: break-word;
white-space: pre-wrap; white-space: pre-wrap;
text-align: left;
.edit-marker { .edit-marker {
font-size: 0.8rem; font-size: 0.8rem;
color: #888888; color: #888888;
margin-left: 6px;
} }
.from-admin & { .from-admin & {
color: $admin-fg; color: $admin-fg;

2
src/components/messages/MessageIncomingText.vue
View file

@ -13,7 +13,7 @@
<div class="message"> <div class="message">
<span v-html="linkify($sanitize(messageText))" /> <span v-html="linkify($sanitize(messageText))" />
<span class="edit-marker" v-if="event.replacingEventId()" <span class="edit-marker" v-if="event.replacingEventId()"
>{{ $t('edited') }}</span >{{ $t('message.edited') }}</span
> >
</div> </div>
<!-- <div>{{ JSON.stringify(event) }}</div> --> <!-- <div>{{ JSON.stringify(event) }}</div> -->

2
src/components/messages/MessageOutgoingText.vue
View file

@ -14,7 +14,7 @@
<div class="message"> <div class="message">
<span v-html="linkify($sanitize(messageText))" /> <span v-html="linkify($sanitize(messageText))" />
<span class="edit-marker" v-if="event.replacingEventId()" <span class="edit-marker" v-if="event.replacingEventId()"
>{{ $t('edited') }}</span >{{ $t('message.edited') }}</span
> >
</div> </div>
</div> </div>