Qortal/qortal-ui
1
0
Fork 1
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-11-04 06:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100 from JustinWesleyFerrari/bugfix/delete-image-icon

Browse Source 
Bugfix/change-msg-bubble-colors
This commit is contained in:
AlphaX-Projects
2023-01-24 21:15:30 +01:00
committed by GitHub
parent 3648ab8975 ccd72ad213
commit 5e3c5cc015
10 changed files with 54 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
img/badges/Level-8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
img/badges/level-10.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
img/badges/level-6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
img/badges/level-7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
img/badges/level-9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

2
qortal-ui-core/font/switch-theme.css
View File

@@ -10,6 +10,7 @@ html {
--chat-group: #080808;
--chat-bubble: #9f9f9f0a;
--chat-bubble-bg: #e6e6e6;
--chat-bubble-myBg: #d1ddf2;
--chat-bubble-msg-color: #080808;
--reaction-bubble-outline: #6b6969;
--chat-menu-bg: #ffffff;
@@ -65,6 +66,7 @@ html[theme="dark"] {
--chat-group: #ffffff;
--chat-bubble: #9694941a;
--chat-bubble-bg: #2d3749;
--chat-bubble-myBg: #40444d;
--chat-bubble-msg-color: #ffffff;
--reaction-bubble-outline: #ffffff;
--chat-menu-bg: #32394c;

2
qortal-ui-core/src/styles/switch-theme.css
View File

@@ -10,6 +10,7 @@ html {
--chat-group: #080808;
--chat-bubble: #9f9f9f0a;
--chat-bubble-bg: #e6e6e6;
--chat-bubble-myBg: #d1ddf2;
--chat-bubble-msg-color: #080808;
--reaction-bubble-outline: #6b6969;
--chat-menu-bg: #ffffff;
@@ -62,6 +63,7 @@ html[theme="dark"] {
--chat-group: #ffffff;
--chat-bubble: #9694941a;
--chat-bubble-bg: #2d3749;
--chat-bubble-myBg: #40444d;
--chat-bubble-msg-color: #ffffff;
--reaction-bubble-outline: #ffffff;
--chat-menu-bg: #32394c;

30
qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
View File

@@ -77,8 +77,8 @@ export const chatStyles = css`
}
.message-data-my-name {
color: var(--mdc-theme-primary);
text-shadow: 0 0 3px var(--mdc-theme-primary);
color: #05be0e;
font-weight: bold;
}
.message-data-time {
@@ -137,6 +137,11 @@ export const chatStyles = css`
min-width: 150px;
}
.message-myBg {
background-color: var(--chat-bubble-myBg) !important;
}
.message-triangle {
position: relative;
}
@@ -153,6 +158,22 @@ export const chatStyles = css`
border-color: transparent transparent var(--chat-bubble-bg) transparent;
}
.message-myTriangle {
position: relative;
}
.message-myTriangle:after {
content: "";
position: absolute;
bottom: 0px;
left: -9px;
width: 0;
height: 0;
border-style: solid;
border-width: 0px 0px 7px 9px;
border-color: transparent transparent var(--chat-bubble-myBg) transparent;
}
.message-reactions {
background-color: transparent;
width: calc(100% - 54px);
@@ -185,9 +206,7 @@ export const chatStyles = css`
}
.original-message-sender {
margin: 0 0 5px 0;
color: var(--mdc-theme-primary);
cursor: pointer;
}
.replied-message {
@@ -198,6 +217,7 @@ export const chatStyles = css`
max-width: 300px;
max-height: 40px;
}
.replied-message p {
margin: 0px;
padding: 0px;
@@ -412,7 +432,7 @@ export const chatStyles = css`
.message-data-level {
height: 21px;
width: 21px;
width: auto;
overflow: hidden;
}

23
qortal-ui-plugins/plugins/core/components/ChatScroller.js
View File

@@ -505,9 +505,12 @@ class MessageTemplate extends LitElement {
`}
<div
class="${`message-subcontainer2
${((this.isFirstMessage === true && this.isSingleMessageInGroup === false) ||
(this.isSingleMessageInGroup === true && this.isLastMessageInGroup === true)) &&
'message-triangle'}`}"
${this.myAddress === this.messageObj.sender && "message-myBg" }
${(((this.isFirstMessage === true && this.isSingleMessageInGroup === false) ||
(this.isSingleMessageInGroup === true && this.isLastMessageInGroup === true)) && this.myAddress !== this.messageObj.sender)
? 'message-triangle'
: (((this.isFirstMessage === true && this.isSingleMessageInGroup === false) ||
(this.isSingleMessageInGroup === true && this.isLastMessageInGroup === true)) && this.myAddress === this.messageObj.sender) ? "message-myTriangle" : null}`}"
style="${(this.isSingleMessageInGroup === true && this.isLastMessageInGroup === false) ? 'margin-bottom: 0;' : null}
${(this.isFirstMessage === false && this.isSingleMessageInGroup === true && this.isLastMessageInGroup === false)
? 'border-radius: 8px 25px 25px 8px;'
@@ -555,14 +558,13 @@ class MessageTemplate extends LitElement {
this.goToRepliedMessage(repliedToData)
}}>
<p
class="original-message-sender">
style=${"cursor: pointer; margin: 0 0 5px 0;"}
class=${this.myAddress !== repliedToData.sender
? "original-message-sender"
: "message-data-my-name"}>
${repliedToData.senderName ?? cropAddress(repliedToData.sender)}
</p>
<p class="replied-message">
${version.toString() === '1' ? html`
${repliedToData.decodedMessage.messageText}
` : ''}
@@ -573,8 +575,8 @@ class MessageTemplate extends LitElement {
Highlight
// other extensions …
]))}
` : ''}
`
: ''}
</p>
</div>
`}
@@ -607,7 +609,6 @@ class MessageTemplate extends LitElement {
<vaadin-icon
@click=${() => {
this.openDeleteImage = true;
this.chatE
}}
class="image-delete-icon" icon="vaadin:close" slot="icon"></vaadin-icon>
` : ''}

1
qortal-ui-plugins/plugins/core/components/LevelFounder.js
View File

@@ -63,6 +63,7 @@ class LevelFounder extends LitElement {
.message-data {
display: flex;
justify-content: center;
align-items: center;
gap: 5px;
}