mirror of
https://github.com/discourse/discourse.git
synced 2024-11-28 11:44:06 -06:00
FIX: revert (edited) layout in chat message (#23927)
* Revert "UX: place (edited) on same line (#23866)" This reverts commitc1017a479b
. * Revert "UX: prevent (edited) and following from being copied (#23882)" This reverts commit563bff509a
.
This commit is contained in:
parent
b6d9aa5a4c
commit
29beaff25b
@ -1,9 +1,6 @@
|
||||
<div class="chat-message-collapser">
|
||||
{{#if this.hasUploads}}
|
||||
{{html-safe @cooked}}
|
||||
{{#if @isEdited}}
|
||||
<span class="chat-message-edited">({{i18n "chat.edited"}})</span>
|
||||
{{/if}}
|
||||
|
||||
<Collapser @header={{this.uploadsHeader}} @onToggle={{@onToggleCollapse}}>
|
||||
<div class="chat-uploads">
|
||||
@ -28,8 +25,5 @@
|
||||
{{cooked.body}}
|
||||
{{/if}}
|
||||
{{/each}}
|
||||
{{#if @isEdited}}
|
||||
<span class="chat-message-edited">({{i18n "chat.edited"}})</span>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
</div>
|
@ -4,13 +4,14 @@
|
||||
@cooked={{@cooked}}
|
||||
@uploads={{@uploads}}
|
||||
@onToggleCollapse={{@onToggleCollapse}}
|
||||
@isEdited={{this.isEdited}}
|
||||
/>
|
||||
{{else}}
|
||||
{{html-safe @cooked}}
|
||||
{{/if}}
|
||||
|
||||
{{#if this.isEdited}}
|
||||
<span class="chat-message-edited">({{i18n "chat.edited"}})</span>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{yield}}
|
||||
</div>
|
@ -60,10 +60,6 @@
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
|
||||
p {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
code {
|
||||
box-sizing: border-box;
|
||||
font-size: var(--font-down-1);
|
||||
@ -97,7 +93,6 @@
|
||||
display: inline-block;
|
||||
color: var(--primary-medium);
|
||||
font-size: var(--font-down-2);
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.chat-message-reaction-list,
|
||||
|
Loading…
Reference in New Issue
Block a user