4
1
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-02-11 09:45:52 +00:00

Merge pull request #349 from AlphaX-Qortal/master

Fix key icon
This commit is contained in:
AlphaX 2025-02-10 16:40:11 +01:00 committed by GitHub
commit 5011917a68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1250,17 +1250,9 @@ class MessageTemplate extends LitElement {
</span> </span>
` `
fromHubOk = html` fromHubOk = html`&nbsp;&nbsp;&nbsp;<mwc-icon style="font-size:16px; color: var(--chat-group);">key</mwc-icon>&nbsp;&nbsp;&nbsp;`
<div style="margin-top:3px;">
<mwc-icon style="font-size:16px; color: var(--chat-group);">key</mwc-icon>&nbsp;&nbsp;
</div>
`
fromHubNo = html` fromHubNo = html`&nbsp;&nbsp;&nbsp;<mwc-icon style="font-size:16px; color: var(--chat-group);">key_off</mwc-icon>&nbsp;&nbsp;&nbsp;`
<div style="margin-top:3px;">
<mwc-icon style="font-size:16px; color: var(--chat-group);">key_off</mwc-icon>&nbsp;&nbsp;
</div>
`
if (repliedToData) { if (repliedToData) {
try { try {
@ -1678,26 +1670,38 @@ class MessageTemplate extends LitElement {
${this.isInProgress ? html` ${this.isInProgress ? html`
<p>${translate('chatpage.cchange91')}</p> <p>${translate('chatpage.cchange91')}</p>
` : this.isAgo ? html` ` : this.isAgo ? html`
${isFromHub ? html`<span>${fromHubOk}</span>` : html`<span>${fromHubNo}</span>`} <div style="display: flex; align-items: center;">
<div id="timeformat"> <div style="margin-top: 4px;">
<span> ${isFromHub ? html`${fromHubOk}` : html`${fromHubNo}`}
<message-time timestamp=${this.messageObj.timestamp}></message-time> </div>
</span> <div id="timeformat">
<span>
<message-time timestamp=${this.messageObj.timestamp}></message-time>
</span>
</div>
</div> </div>
` : this.isIso ? html` ` : this.isIso ? html`
${isFromHub ? html`<span>${fromHubOk}</span>` : html`<span>${fromHubNo}</span>`} <div style="display: flex; align-items: center;">
<div id="timeformat"> <div style="margin-top: 4px;">
<span> ${isFromHub ? html`${fromHubOk}` : html`${fromHubNo}`}
${new Date(this.messageObj.timestamp).toLocaleString()} </div>
</span> <div id="timeformat">
<span>
${new Date(this.messageObj.timestamp).toLocaleString()}
</span>
</div>
</div> </div>
` : this.isBoth ? html` ` : this.isBoth ? html`
${isFromHub ? html`<span>${fromHubOk}</span>` : html`<span>${fromHubNo}</span>`} <div style="display: flex; align-items: center;">
<div id="timeformat"> <div style="margin-top: 4px;">
<span> ${isFromHub ? html`${fromHubOk}` : html`${fromHubNo}`}
${new Date(this.messageObj.timestamp).toLocaleString()} </div>
( <message-time timestamp=${this.messageObj.timestamp}></message-time> ) <div id="timeformat">
</span> <span>
${new Date(this.messageObj.timestamp).toLocaleString()}
( <message-time timestamp=${this.messageObj.timestamp}></message-time> )
</span>
</div>
</div> </div>
` : '' ` : ''
} }