diff --git a/img/badges/Level-8.png b/img/badges/Level-8.png new file mode 100644 index 00000000..b5dede17 Binary files /dev/null and b/img/badges/Level-8.png differ diff --git a/img/badges/level-10.png b/img/badges/level-10.png new file mode 100644 index 00000000..22dfc605 Binary files /dev/null and b/img/badges/level-10.png differ diff --git a/img/badges/level-6.png b/img/badges/level-6.png new file mode 100644 index 00000000..213ded13 Binary files /dev/null and b/img/badges/level-6.png differ diff --git a/img/badges/level-7.png b/img/badges/level-7.png new file mode 100644 index 00000000..b9141272 Binary files /dev/null and b/img/badges/level-7.png differ diff --git a/img/badges/level-9.png b/img/badges/level-9.png new file mode 100644 index 00000000..77fa2d52 Binary files /dev/null and b/img/badges/level-9.png differ diff --git a/qortal-ui-core/font/switch-theme.css b/qortal-ui-core/font/switch-theme.css index 6c78e322..d79d6906 100644 --- a/qortal-ui-core/font/switch-theme.css +++ b/qortal-ui-core/font/switch-theme.css @@ -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; diff --git a/qortal-ui-core/src/styles/switch-theme.css b/qortal-ui-core/src/styles/switch-theme.css index fe928e12..ab8187c9 100644 --- a/qortal-ui-core/src/styles/switch-theme.css +++ b/qortal-ui-core/src/styles/switch-theme.css @@ -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; diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js index 177f9265..f3d8c32b 100644 --- a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js +++ b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js @@ -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; } diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js index 4178041b..fc905f64 100644 --- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js +++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js @@ -502,9 +502,12 @@ class MessageTemplate extends LitElement { `}
`} ${image && !isImageDeleted && !this.viewImage && this.myAddress !== this.messageObj.sender ? html` @@ -604,7 +606,6 @@ class MessageTemplate extends LitElement {