FIX: revert (edited) layout in chat message (#23927)

* Revert "UX: place (edited) on same line (#23866)"

This reverts commit c1017a479b.

* Revert "UX: prevent (edited) and following from being copied (#23882)"

This reverts commit 563bff509a.
This commit is contained in:
chapoi
2023-10-13 14:01:56 +03:00
committed by GitHub
parent b6d9aa5a4c
commit 29beaff25b
3 changed files with 5 additions and 15 deletions

View File

@@ -1,9 +1,6 @@
<div class="chat-message-collapser"> <div class="chat-message-collapser">
{{#if this.hasUploads}} {{#if this.hasUploads}}
{{html-safe @cooked}} {{html-safe @cooked}}
{{#if @isEdited}}
<span class="chat-message-edited">({{i18n "chat.edited"}})</span>
{{/if}}
<Collapser @header={{this.uploadsHeader}} @onToggle={{@onToggleCollapse}}> <Collapser @header={{this.uploadsHeader}} @onToggle={{@onToggleCollapse}}>
<div class="chat-uploads"> <div class="chat-uploads">
@@ -28,8 +25,5 @@
{{cooked.body}} {{cooked.body}}
{{/if}} {{/if}}
{{/each}} {{/each}}
{{#if @isEdited}}
<span class="chat-message-edited">({{i18n "chat.edited"}})</span>
{{/if}}
{{/if}} {{/if}}
</div> </div>

View File

@@ -4,13 +4,14 @@
@cooked={{@cooked}} @cooked={{@cooked}}
@uploads={{@uploads}} @uploads={{@uploads}}
@onToggleCollapse={{@onToggleCollapse}} @onToggleCollapse={{@onToggleCollapse}}
@isEdited={{this.isEdited}}
/> />
{{else}} {{else}}
{{html-safe @cooked}} {{html-safe @cooked}}
{{#if this.isEdited}}
<span class="chat-message-edited">({{i18n "chat.edited"}})</span>
{{/if}}
{{/if}} {{/if}}
{{#if this.isEdited}}
<span class="chat-message-edited">({{i18n "chat.edited"}})</span>
{{/if}}
{{yield}} {{yield}}
</div> </div>

View File

@@ -60,10 +60,6 @@
min-width: 0; min-width: 0;
width: 100%; width: 100%;
p {
display: inline-block;
}
code { code {
box-sizing: border-box; box-sizing: border-box;
font-size: var(--font-down-1); font-size: var(--font-down-1);
@@ -97,7 +93,6 @@
display: inline-block; display: inline-block;
color: var(--primary-medium); color: var(--primary-medium);
font-size: var(--font-down-2); font-size: var(--font-down-2);
user-select: none;
} }
.chat-message-reaction-list, .chat-message-reaction-list,