Skip to content

refine message style #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2024
Merged

refine message style #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/lib/common/Markdown.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
/** @type {string} */
export let containerClasses = "";

/** @type {string} */
export let containerStyles = "";

/** @type {boolean} */
export let rawText = false;

Expand All @@ -23,6 +26,6 @@
}
</script>

<div class={`markdown-container ${containerClasses || 'text-white'}`}>
<div class={`markdown-container markdown-lite ${containerClasses || 'text-white'}`} style={`${containerStyles}`}>
{@html displayText}
</div>
25 changes: 22 additions & 3 deletions src/lib/scss/custom/common/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ button:focus {

th, td {
padding: 3px 5px !important;
border: 1px solid white;
}
}

Expand All @@ -225,11 +224,31 @@ button:focus {
margin-bottom: 0 !important;
}

ul {
list-style-position: inside !important;
}
}

.markdown-lite {
table {
th, td {
border: 1px solid white;
}
}

a {
color: white;
}
}

ul {
list-style-position: inside !important;
.markdown-dark {
table {
th, td {
border: 1px solid $primary;
}
}

a {
color: $primary;
}
}
4 changes: 4 additions & 0 deletions src/lib/scss/custom/pages/_chat.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@
display: flex;
flex-direction: column;
width: 80%;

.bot-msg {
background-color: var(--#{$prefix}light) !important;
}
}

.ctext-wrap {
Expand Down
9 changes: 5 additions & 4 deletions src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@
/** @param {string} messageId */
function highlightChatMessage(messageId) {
const targets = document.querySelectorAll('.user-msg');
const style = ['bg-danger', 'text-white'];
const style = ['bg-danger'];
targets.forEach(elm => {
if (elm.id === `user-msg-${messageId}`) {
elm.classList.add(...style);
Expand Down Expand Up @@ -1590,11 +1590,12 @@
on:keydown={() => {}}
on:click={() => directToLog(message.message_id)}
>
<div class="ctext-wrap user-msg"
<div
class="ctext-wrap user-msg bg-primary"
class:clickable={!isLite && isLoadPersistLog}
id={`user-msg-${message.message_id}`}
>
<div class="text-start fw-bold">{@html replaceNewLine(message.text)}</div>
<div class="text-start fw-bold text-white">{@html replaceNewLine(message.text)}</div>
</div>
<p class="chat-time mb-0 float-end">
<i class="bx bx-time-five align-middle me-1" />
Expand Down Expand Up @@ -1633,7 +1634,7 @@
{/if}
</div>
<div class="msg-container">
<RcMessage message={message} />
<RcMessage containerClasses={'bot-msg'} markdownClasses={'markdown-dark text-dark'} message={message} />
{#if message?.message_id === lastBotMsg?.message_id && message?.uuid === lastBotMsg?.uuid}
<div style="display: flex; gap: 10px;">
{#if PUBLIC_LIVECHAT_SPEAKER_ENABLED === 'true'}
Expand Down
16 changes: 14 additions & 2 deletions src/routes/chat/[agentId]/[conversationId]/rich-content/rc-message.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,22 @@

/** @type {any} */
export let message;

/** @type {string} */
export let containerClasses = '';

/** @type {string} */
export let containerStyles = '';

/** @type {string} */
export let markdownClasses = '';
</script>

<div class="ctext-wrap bg-primary">
<div
class={`ctext-wrap bg-primary ${containerClasses}`}
style={`${containerStyles}`}
>
<div class="flex-shrink-0 align-self-center">
<Markdown text={message?.rich_content?.message?.text || message?.text} rawText />
<Markdown containerClasses={markdownClasses} text={message?.rich_content?.message?.text || message?.text} rawText />
</div>
</div>
Loading