fix: Update chat UI theme management
Some checks failed
BotUI CI / build (push) Failing after 49m45s
Some checks failed
BotUI CI / build (push) Failing after 49m45s
This commit is contained in:
parent
785187868e
commit
4987a15858
3 changed files with 63 additions and 34 deletions
|
|
@ -73,6 +73,7 @@
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transform: translateX(20px);
|
transform: translateX(20px);
|
||||||
}
|
}
|
||||||
|
|
||||||
to {
|
to {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
transform: translateX(0);
|
transform: translateX(0);
|
||||||
|
|
@ -97,11 +98,13 @@
|
||||||
/* Connection Status - use shared styles from app.css */
|
/* Connection Status - use shared styles from app.css */
|
||||||
|
|
||||||
@keyframes pulse {
|
@keyframes pulse {
|
||||||
|
|
||||||
0%,
|
0%,
|
||||||
100% {
|
100% {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
transform: scale(1);
|
transform: scale(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
50% {
|
50% {
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
transform: scale(1.2);
|
transform: scale(1.2);
|
||||||
|
|
@ -216,6 +219,7 @@
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transform: translateY(10px);
|
transform: translateY(10px);
|
||||||
}
|
}
|
||||||
|
|
||||||
to {
|
to {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
|
|
@ -551,9 +555,9 @@ footer {
|
||||||
.suggestion-button {
|
.suggestion-button {
|
||||||
padding: 6px 12px;
|
padding: 6px 12px;
|
||||||
border-radius: 20px;
|
border-radius: 20px;
|
||||||
border: 2px solid var(--chat-color1, var(--suggestion-color, #4a9eff));
|
border: 2px solid var(--chat-color2, #002147);
|
||||||
background: var(--chat-color2, rgba(255, 255, 255, 0.15));
|
background: var(--chat-color2, #002147);
|
||||||
color: var(--chat-color1, #ffffff);
|
color: #ffffff;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|
@ -615,8 +619,8 @@ form.input-container {
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-container:focus-within {
|
.input-container:focus-within {
|
||||||
border-color: var(--accent, var(--accent-color, #3b82f6));
|
border-color: var(--chat-color1, var(--accent, #3b82f6));
|
||||||
box-shadow: 0 0 0 3px var(--accent-glow, rgba(59, 130, 246, 0.1));
|
box-shadow: 0 0 0 3px color-mix(in srgb, var(--chat-color1, var(--accent, #3b82f6)) 20%, transparent);
|
||||||
}
|
}
|
||||||
|
|
||||||
#messageInput {
|
#messageInput {
|
||||||
|
|
@ -637,10 +641,14 @@ form.input-container {
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes cursor-blink {
|
@keyframes cursor-blink {
|
||||||
0%, 50% {
|
|
||||||
|
0%,
|
||||||
|
50% {
|
||||||
caret-color: var(--accent, #3b82f6);
|
caret-color: var(--accent, #3b82f6);
|
||||||
}
|
}
|
||||||
51%, 100% {
|
|
||||||
|
51%,
|
||||||
|
100% {
|
||||||
caret-color: transparent;
|
caret-color: transparent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -673,7 +681,7 @@ form.input-container {
|
||||||
}
|
}
|
||||||
|
|
||||||
#sendBtn {
|
#sendBtn {
|
||||||
background: var(--accent, var(--accent-color, #3b82f6));
|
background: var(--chat-color1, var(--accent, #3b82f6));
|
||||||
}
|
}
|
||||||
|
|
||||||
#voiceBtn {
|
#voiceBtn {
|
||||||
|
|
@ -689,7 +697,7 @@ form.input-container {
|
||||||
}
|
}
|
||||||
|
|
||||||
#sendBtn:hover {
|
#sendBtn:hover {
|
||||||
background: var(--accent-hover, var(--accent, #2563eb));
|
background: var(--chat-color1, var(--accent-hover, #2563eb));
|
||||||
}
|
}
|
||||||
|
|
||||||
#voiceBtn:active,
|
#voiceBtn:active,
|
||||||
|
|
@ -700,8 +708,8 @@ form.input-container {
|
||||||
/* Dark/Sentient theme overrides */
|
/* Dark/Sentient theme overrides */
|
||||||
[data-theme="dark"] #sendBtn,
|
[data-theme="dark"] #sendBtn,
|
||||||
[data-theme="sentient"] #sendBtn {
|
[data-theme="sentient"] #sendBtn {
|
||||||
background: var(--accent, #d4f505);
|
background: var(--chat-color1, #d4f505);
|
||||||
color: #000000;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
[data-theme="dark"] #voiceBtn,
|
[data-theme="dark"] #voiceBtn,
|
||||||
|
|
@ -784,6 +792,7 @@ form.input-container {
|
||||||
from {
|
from {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
to {
|
to {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
@ -1271,10 +1280,14 @@ form.input-container {
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes thinkingBounce {
|
@keyframes thinkingBounce {
|
||||||
0%, 80%, 100% {
|
|
||||||
|
0%,
|
||||||
|
80%,
|
||||||
|
100% {
|
||||||
transform: scale(0.8);
|
transform: scale(0.8);
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
40% {
|
40% {
|
||||||
transform: scale(1);
|
transform: scale(1);
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
|
|
@ -1331,6 +1344,7 @@ form.input-container {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transform: translateY(20px) scale(0.95);
|
transform: translateY(20px) scale(0.95);
|
||||||
}
|
}
|
||||||
|
|
||||||
to {
|
to {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
transform: translateY(0) scale(1);
|
transform: translateY(0) scale(1);
|
||||||
|
|
@ -1396,9 +1410,12 @@ form.input-container {
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes bounce {
|
@keyframes bounce {
|
||||||
0%, 100% {
|
|
||||||
|
0%,
|
||||||
|
100% {
|
||||||
transform: translateX(-50%) translateY(0);
|
transform: translateX(-50%) translateY(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
50% {
|
50% {
|
||||||
transform: translateX(-50%) translateY(-5px);
|
transform: translateX(-50%) translateY(-5px);
|
||||||
}
|
}
|
||||||
|
|
@ -1432,10 +1449,14 @@ form.input-container {
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes typing {
|
@keyframes typing {
|
||||||
0%, 60%, 100% {
|
|
||||||
|
0%,
|
||||||
|
60%,
|
||||||
|
100% {
|
||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
30% {
|
30% {
|
||||||
transform: translateY(-8px);
|
transform: translateY(-8px);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -979,13 +979,14 @@
|
||||||
|
|
||||||
// Get the theme manager's theme for this bot to check if user selected a different theme
|
// Get the theme manager's theme for this bot to check if user selected a different theme
|
||||||
var botId = botName.toLowerCase();
|
var botId = botName.toLowerCase();
|
||||||
|
var botThemeKey = "gb-theme-" + botId;
|
||||||
var botTheme = window.ThemeManager ? (
|
var botTheme = window.ThemeManager ? (
|
||||||
// Get bot-specific theme from theme manager's mapping
|
// Get bot-specific theme from theme manager's mapping
|
||||||
(window.ThemeManager.getAvailableThemes &&
|
(window.ThemeManager.getAvailableThemes &&
|
||||||
window.ThemeManager.getAvailableThemes().find(t => t.id === botId)) ||
|
window.ThemeManager.getAvailableThemes().find(t => t.id === botId)) ||
|
||||||
// Fallback to localStorage
|
// Fallback to localStorage
|
||||||
localStorage.getItem("gb-theme")
|
localStorage.getItem(botThemeKey)
|
||||||
) : localStorage.getItem("gb-theme");
|
) : localStorage.getItem(botThemeKey);
|
||||||
|
|
||||||
// Check if bot config has a theme-base setting
|
// Check if bot config has a theme-base setting
|
||||||
var configThemeBase = config.theme_base || config["theme-base"] || "light";
|
var configThemeBase = config.theme_base || config["theme-base"] || "light";
|
||||||
|
|
@ -993,7 +994,7 @@
|
||||||
// Only use bot config colors if:
|
// Only use bot config colors if:
|
||||||
// 1. No theme has been explicitly selected by user (localStorage empty or default)
|
// 1. No theme has been explicitly selected by user (localStorage empty or default)
|
||||||
// 2. AND the bot config's theme-base matches the current theme
|
// 2. AND the bot config's theme-base matches the current theme
|
||||||
var localStorageTheme = localStorage.getItem("gb-theme");
|
var localStorageTheme = localStorage.getItem(botThemeKey);
|
||||||
var useBotConfigColors = !localStorageTheme ||
|
var useBotConfigColors = !localStorageTheme ||
|
||||||
localStorageTheme === "default" ||
|
localStorageTheme === "default" ||
|
||||||
localStorageTheme === configThemeBase;
|
localStorageTheme === configThemeBase;
|
||||||
|
|
@ -1006,6 +1007,7 @@
|
||||||
|
|
||||||
// Only set bot config colors if user hasn't selected a different theme
|
// Only set bot config colors if user hasn't selected a different theme
|
||||||
if (useBotConfigColors) {
|
if (useBotConfigColors) {
|
||||||
|
document.documentElement.setAttribute("data-has-bot-colors", "true");
|
||||||
document.documentElement.style.setProperty("--chat-color1", color1);
|
document.documentElement.style.setProperty("--chat-color1", color1);
|
||||||
document.documentElement.style.setProperty("--chat-color2", color2);
|
document.documentElement.style.setProperty("--chat-color2", color2);
|
||||||
document.documentElement.style.setProperty("--suggestion-color", color1);
|
document.documentElement.style.setProperty("--suggestion-color", color1);
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,8 @@ const ThemeManager = (() => {
|
||||||
|
|
||||||
if (!theme.file) {
|
if (!theme.file) {
|
||||||
currentThemeId = "default";
|
currentThemeId = "default";
|
||||||
localStorage.setItem("gb-theme", "default");
|
const botId = getCurrentBotId();
|
||||||
|
localStorage.setItem(`gb-theme-${botId}`, "default");
|
||||||
// Re-enable sentient theme for default
|
// Re-enable sentient theme for default
|
||||||
document.documentElement.setAttribute("data-theme", "sentient");
|
document.documentElement.setAttribute("data-theme", "sentient");
|
||||||
updateDropdown();
|
updateDropdown();
|
||||||
|
|
@ -81,7 +82,8 @@ const ThemeManager = (() => {
|
||||||
link.onload = () => {
|
link.onload = () => {
|
||||||
console.log("✓ Theme loaded:", theme.name);
|
console.log("✓ Theme loaded:", theme.name);
|
||||||
currentThemeId = id;
|
currentThemeId = id;
|
||||||
localStorage.setItem("gb-theme", id);
|
const botId = getCurrentBotId();
|
||||||
|
localStorage.setItem(`gb-theme-${botId}`, id);
|
||||||
|
|
||||||
// Keep data-theme="sentient" on html so CSS selectors work
|
// Keep data-theme="sentient" on html so CSS selectors work
|
||||||
// The inline styles will override the colors
|
// The inline styles will override the colors
|
||||||
|
|
@ -150,14 +152,16 @@ const ThemeManager = (() => {
|
||||||
document.documentElement.style.setProperty("--border", borderHex);
|
document.documentElement.style.setProperty("--border", borderHex);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update ALL color-related CSS variables to match the theme
|
// Check if config.csv already set the primary color, we shouldn't wipe it
|
||||||
// This overrides any bot config colors
|
// Only update color and suggestion variables if they aren't marked as bot-config
|
||||||
document.documentElement.style.setProperty("--chat-color1", `hsl(${primary})`);
|
if (document.documentElement.getAttribute("data-has-bot-colors") !== "true") {
|
||||||
document.documentElement.style.setProperty("--chat-color2", `hsl(${card})`);
|
document.documentElement.style.setProperty("--chat-color1", `hsl(${primary})`);
|
||||||
document.documentElement.style.setProperty("--suggestion-color", `hsl(${primary})`);
|
document.documentElement.style.setProperty("--chat-color2", `hsl(${card})`);
|
||||||
document.documentElement.style.setProperty("--suggestion-bg", `hsl(${card})`);
|
document.documentElement.style.setProperty("--suggestion-color", `hsl(${primary})`);
|
||||||
document.documentElement.style.setProperty("--color1", `hsl(${primary})`);
|
document.documentElement.style.setProperty("--suggestion-bg", `hsl(${card})`);
|
||||||
document.documentElement.style.setProperty("--color2", `hsl(${card})`);
|
document.documentElement.style.setProperty("--color1", `hsl(${primary})`);
|
||||||
|
document.documentElement.style.setProperty("--color2", `hsl(${card})`);
|
||||||
|
}
|
||||||
|
|
||||||
console.log("✓ Theme colors applied:", { bg: background, primary: primary });
|
console.log("✓ Theme colors applied:", { bg: background, primary: primary });
|
||||||
updateDropdown();
|
updateDropdown();
|
||||||
|
|
@ -198,13 +202,13 @@ const ThemeManager = (() => {
|
||||||
|
|
||||||
// Then load the UI theme (CSS theme)
|
// Then load the UI theme (CSS theme)
|
||||||
// Priority: 1) localStorage user preference, 2) bot-specific theme, 3) default
|
// Priority: 1) localStorage user preference, 2) bot-specific theme, 3) default
|
||||||
let saved = localStorage.getItem("gb-theme");
|
const botId = getCurrentBotId();
|
||||||
|
let saved = localStorage.getItem(`gb-theme-${botId}`);
|
||||||
if (!saved || !themes.find((t) => t.id === saved)) {
|
if (!saved || !themes.find((t) => t.id === saved)) {
|
||||||
// No user preference, try bot-specific theme
|
// No user preference, try bot-specific theme
|
||||||
const botId = getCurrentBotId();
|
|
||||||
saved = botThemeMap[botId] || "light";
|
saved = botThemeMap[botId] || "light";
|
||||||
// Save to localStorage so it persists
|
// Save to localStorage so it persists
|
||||||
localStorage.setItem("gb-theme", saved);
|
localStorage.setItem(`gb-theme-${botId}`, saved);
|
||||||
}
|
}
|
||||||
if (!themes.find((t) => t.id === saved)) saved = "default";
|
if (!themes.find((t) => t.id === saved)) saved = "default";
|
||||||
currentThemeId = saved;
|
currentThemeId = saved;
|
||||||
|
|
@ -219,7 +223,8 @@ const ThemeManager = (() => {
|
||||||
|
|
||||||
function setThemeFromServer(data) {
|
function setThemeFromServer(data) {
|
||||||
// Save theme to localStorage for persistence across page loads
|
// Save theme to localStorage for persistence across page loads
|
||||||
localStorage.setItem("gb-theme-data", JSON.stringify(data));
|
const botId = getCurrentBotId();
|
||||||
|
localStorage.setItem(`gb-theme-data-${botId}`, JSON.stringify(data));
|
||||||
|
|
||||||
// Load base theme if specified
|
// Load base theme if specified
|
||||||
if (data.theme_base) {
|
if (data.theme_base) {
|
||||||
|
|
@ -263,12 +268,13 @@ const ThemeManager = (() => {
|
||||||
|
|
||||||
// Load saved theme from localStorage on page load
|
// Load saved theme from localStorage on page load
|
||||||
function loadSavedTheme() {
|
function loadSavedTheme() {
|
||||||
const savedTheme = localStorage.getItem("gb-theme-data");
|
const botId = getCurrentBotId();
|
||||||
|
const savedTheme = localStorage.getItem(`gb-theme-data-${botId}`);
|
||||||
if (savedTheme) {
|
if (savedTheme) {
|
||||||
try {
|
try {
|
||||||
const data = JSON.parse(savedTheme);
|
const data = JSON.parse(savedTheme);
|
||||||
setThemeFromServer(data);
|
setThemeFromServer(data);
|
||||||
console.log("✓ Theme loaded from localStorage");
|
console.log(`✓ Theme loaded from localStorage for ${botId}`);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("Failed to load saved theme:", e);
|
console.warn("Failed to load saved theme:", e);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue