Remove christmas & make swarm default (#4522)

* swarm + catppuccin maybe?

* i will kill you

* blocked nine vicious

* encore

* chud

* this 97 year old diner still serves coke the old way

* ey boy i just got that new iphone

* @grok just fix my shit bro
This commit is contained in:
fmhyhalloweenshit 2026-01-01 14:16:37 +03:00 committed by GitHub
parent e8a9e4efd9
commit 0c6aeb1529
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 107 additions and 162 deletions

View file

@ -13,13 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import { christmasTheme } from './christmas'
import { catppuccinTheme } from './catppuccin' import { catppuccinTheme } from './catppuccin'
import type { ThemeRegistry } from '../types' import type { ThemeRegistry } from '../types'
export const themeRegistry: ThemeRegistry = { export const themeRegistry: ThemeRegistry = {
catppuccin: catppuccinTheme, catppuccin: catppuccinTheme,
christmas: christmasTheme,
} }
export { christmasTheme, catppuccinTheme } export { catppuccinTheme }

View file

@ -21,54 +21,75 @@ import { themeRegistry } from './configs'
const STORAGE_KEY_THEME = 'vitepress-theme-name' const STORAGE_KEY_THEME = 'vitepress-theme-name'
const STORAGE_KEY_MODE = 'vitepress-display-mode' const STORAGE_KEY_MODE = 'vitepress-display-mode'
const STORAGE_KEY_AMOLED = 'vitepress-amoled-enabled' const STORAGE_KEY_AMOLED = 'vitepress-amoled-enabled'
const STORAGE_KEY_THEME_DATA = 'vitepress-theme-data'
export class ThemeHandler { export class ThemeHandler {
private state = ref<ThemeState>({ private state = ref<ThemeState>({
currentTheme: 'christmas', currentTheme: 'swarm',
currentMode: 'light' as DisplayMode, currentMode: 'light' as DisplayMode,
theme: themeRegistry.christmas theme: null
}) })
private amoledEnabled = ref(false) private amoledEnabled = ref(false)
private initTime = 0
constructor() { constructor() {
if (typeof window !== 'undefined') {
this.initTime = Date.now()
}
this.initializeTheme() this.initializeTheme()
} }
private initializeTheme() { private initializeTheme() {
if (typeof window === 'undefined') return if (typeof window === 'undefined') return
// Load saved preferences const savedTheme = localStorage.getItem(STORAGE_KEY_THEME) || 'color-swarm'
const savedTheme = localStorage.getItem(STORAGE_KEY_THEME) || 'christmas'
const savedMode = localStorage.getItem(STORAGE_KEY_MODE) as DisplayMode | null const savedMode = localStorage.getItem(STORAGE_KEY_MODE) as DisplayMode | null
const savedAmoled = localStorage.getItem(STORAGE_KEY_AMOLED) === 'true' const savedAmoled = localStorage.getItem(STORAGE_KEY_AMOLED) === 'true'
if (!localStorage.getItem(STORAGE_KEY_THEME)) {
localStorage.setItem(STORAGE_KEY_THEME, 'color-swarm')
}
if (!localStorage.getItem('preferred-color')) {
localStorage.setItem('preferred-color', 'swarm')
}
console.log('[ThemeHandler] Initializing. Raw Storage:', savedTheme)
if (themeRegistry[savedTheme]) { if (themeRegistry[savedTheme]) {
console.log('[ThemeHandler] Found Custom Theme:', savedTheme)
this.state.value.currentTheme = savedTheme this.state.value.currentTheme = savedTheme
this.state.value.theme = themeRegistry[savedTheme] this.state.value.theme = themeRegistry[savedTheme]
} }
else if (themeRegistry[savedTheme.replace('color-', '')]) {
const cleanName = savedTheme.replace('color-', '')
console.log('[ThemeHandler] Found Custom Theme (cleaned):', cleanName)
this.state.value.currentTheme = cleanName
this.state.value.theme = themeRegistry[cleanName]
}
else {
const cleanName = savedTheme.replace('color-', '')
console.log('[ThemeHandler] Using Preset Theme:', cleanName)
this.state.value.currentTheme = cleanName
this.state.value.theme = null
}
// Set amoled preference
this.amoledEnabled.value = savedAmoled this.amoledEnabled.value = savedAmoled
// Set mode
if (savedMode) { if (savedMode) {
this.state.value.currentMode = savedMode this.state.value.currentMode = savedMode
} else { } else {
// Detect system preference for initial mode
const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches
this.state.value.currentMode = prefersDark ? 'dark' : 'light' this.state.value.currentMode = prefersDark ? 'dark' : 'light'
} }
this.applyTheme() this.applyTheme()
// Listen for system theme changes (only if user hasn't set a preference)
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (e) => { window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (e) => {
if (!localStorage.getItem(STORAGE_KEY_MODE)) { if (!localStorage.getItem(STORAGE_KEY_MODE)) {
this.state.value.currentMode = e.matches ? 'dark' : 'light' this.state.value.currentMode = e.matches ? 'dark' : 'light'
this.applyTheme() this.applyTheme()
} } else {
else {
this.applyTheme() this.applyTheme()
} }
}) })
@ -78,39 +99,44 @@ export class ThemeHandler {
if (typeof document === 'undefined') return if (typeof document === 'undefined') return
const { currentMode, theme } = this.state.value const { currentMode, theme } = this.state.value
const modeColors = theme.modes[currentMode]
if (!theme || !theme.modes || !theme.modes[currentMode]) {
this.applyDOMClasses(currentMode)
this.clearCustomCSSVariables()
return
}
const modeColors = theme.modes[currentMode]
this.applyDOMClasses(currentMode) this.applyDOMClasses(currentMode)
this.applyCSSVariables(modeColors, theme) this.applyCSSVariables(modeColors, theme)
} }
private applyDOMClasses(mode: DisplayMode) { private applyDOMClasses(mode: DisplayMode) {
const root = document.documentElement const root = document.documentElement
// Remove all mode classes
root.classList.remove('dark', 'light', 'amoled') root.classList.remove('dark', 'light', 'amoled')
// Add current mode class
root.classList.add(mode) root.classList.add(mode)
// Add amoled class if enabled in dark mode
if (mode === 'dark' && this.amoledEnabled.value) { if (mode === 'dark' && this.amoledEnabled.value) {
root.classList.add('amoled') root.classList.add('amoled')
} }
} }
private applyCSSVariables(colors: ModeColors, theme: Theme) { private clearCustomCSSVariables() {
if (typeof document === 'undefined') return if (typeof document === 'undefined') return
const root = document.documentElement const root = document.documentElement
// Clear ALL inline styles related to theming to ensure clean slate
const allStyleProps = Array.from(root.style) const allStyleProps = Array.from(root.style)
allStyleProps.forEach(prop => { allStyleProps.forEach(prop => {
if (prop.startsWith('--vp-')) { if (prop.startsWith('--vp-')) {
root.style.removeProperty(prop) root.style.removeProperty(prop)
} }
}) })
}
private applyCSSVariables(colors: ModeColors, theme: Theme) {
if (typeof document === 'undefined') return
const root = document.documentElement
this.clearCustomCSSVariables()
let bgColor = colors.bg let bgColor = colors.bg
let bgAltColor = colors.bgAlt let bgAltColor = colors.bgAlt
let bgElvColor = colors.bgElv let bgElvColor = colors.bgElv
@ -121,22 +147,13 @@ export class ThemeHandler {
bgElvColor = 'rgba(0, 0, 0, 0.9)' bgElvColor = 'rgba(0, 0, 0, 0.9)'
} }
// Apply brand colors only if theme specifies them
// Otherwise, remove inline styles to let ColorPicker CSS take effect
if (colors.brand && (colors.brand[1] || colors.brand[2] || colors.brand[3] || colors.brand.soft)) { if (colors.brand && (colors.brand[1] || colors.brand[2] || colors.brand[3] || colors.brand.soft)) {
if (colors.brand[1]) root.style.setProperty('--vp-c-brand-1', colors.brand[1]) if (colors.brand[1]) root.style.setProperty('--vp-c-brand-1', colors.brand[1])
if (colors.brand[2]) root.style.setProperty('--vp-c-brand-2', colors.brand[2]) if (colors.brand[2]) root.style.setProperty('--vp-c-brand-2', colors.brand[2])
if (colors.brand[3]) root.style.setProperty('--vp-c-brand-3', colors.brand[3]) if (colors.brand[3]) root.style.setProperty('--vp-c-brand-3', colors.brand[3])
if (colors.brand.soft) root.style.setProperty('--vp-c-brand-soft', colors.brand.soft) if (colors.brand.soft) root.style.setProperty('--vp-c-brand-soft', colors.brand.soft)
} else {
// Remove inline brand color styles so ColorPicker CSS can apply
root.style.removeProperty('--vp-c-brand-1')
root.style.removeProperty('--vp-c-brand-2')
root.style.removeProperty('--vp-c-brand-3')
root.style.removeProperty('--vp-c-brand-soft')
} }
// Apply background colors
root.style.setProperty('--vp-c-bg', bgColor) root.style.setProperty('--vp-c-bg', bgColor)
root.style.setProperty('--vp-c-bg-alt', bgAltColor) root.style.setProperty('--vp-c-bg-alt', bgAltColor)
root.style.setProperty('--vp-c-bg-elv', bgElvColor) root.style.setProperty('--vp-c-bg-elv', bgElvColor)
@ -144,34 +161,12 @@ export class ThemeHandler {
root.style.setProperty('--vp-c-bg-mark', colors.bgMark) root.style.setProperty('--vp-c-bg-mark', colors.bgMark)
} }
// Apply text colors - always set them to ensure proper theme switching
if (colors.text) { if (colors.text) {
if (colors.text[1]) root.style.setProperty('--vp-c-text-1', colors.text[1]) if (colors.text[1]) root.style.setProperty('--vp-c-text-1', colors.text[1])
if (colors.text[2]) root.style.setProperty('--vp-c-text-2', colors.text[2]) if (colors.text[2]) root.style.setProperty('--vp-c-text-2', colors.text[2])
if (colors.text[3]) root.style.setProperty('--vp-c-text-3', colors.text[3]) if (colors.text[3]) root.style.setProperty('--vp-c-text-3', colors.text[3])
} else {
// Remove inline styles if theme doesn't specify text colors
// This allows CSS variables from style.scss to take effect
root.style.removeProperty('--vp-c-text-1')
root.style.removeProperty('--vp-c-text-2')
root.style.removeProperty('--vp-c-text-3')
} }
// Debug: log applied text color variables so we can inspect in console
try {
// eslint-disable-next-line no-console
console.log('[ThemeHandler] applied text vars', {
theme: theme.name,
mode: this.state.value.currentMode,
vp_text_1: root.style.getPropertyValue('--vp-c-text-1'),
vp_text_2: root.style.getPropertyValue('--vp-c-text-2'),
vp_text_3: root.style.getPropertyValue('--vp-c-text-3')
})
} catch (e) {
// ignore
}
// Apply button colors
root.style.setProperty('--vp-button-brand-bg', colors.button.brand.bg) root.style.setProperty('--vp-button-brand-bg', colors.button.brand.bg)
root.style.setProperty('--vp-button-brand-border', colors.button.brand.border) root.style.setProperty('--vp-button-brand-border', colors.button.brand.border)
root.style.setProperty('--vp-button-brand-text', colors.button.brand.text) root.style.setProperty('--vp-button-brand-text', colors.button.brand.text)
@ -186,7 +181,6 @@ export class ThemeHandler {
root.style.setProperty('--vp-button-alt-hover-bg', colors.button.alt.hoverBg) root.style.setProperty('--vp-button-alt-hover-bg', colors.button.alt.hoverBg)
root.style.setProperty('--vp-button-alt-hover-text', colors.button.alt.hoverText) root.style.setProperty('--vp-button-alt-hover-text', colors.button.alt.hoverText)
// Apply custom block colors
const blocks = ['info', 'tip', 'warning', 'danger'] as const const blocks = ['info', 'tip', 'warning', 'danger'] as const
blocks.forEach((block) => { blocks.forEach((block) => {
const blockColors = colors.customBlock[block] const blockColors = colors.customBlock[block]
@ -196,84 +190,69 @@ export class ThemeHandler {
root.style.setProperty(`--vp-custom-block-${block}-text-deep`, blockColors.textDeep) root.style.setProperty(`--vp-custom-block-${block}-text-deep`, blockColors.textDeep)
}) })
// Apply selection color
root.style.setProperty('--vp-c-selection-bg', colors.selection.bg) root.style.setProperty('--vp-c-selection-bg', colors.selection.bg)
// Apply home hero colors (if defined)
if (colors.home) { if (colors.home) {
root.style.setProperty('--vp-home-hero-name-color', colors.home.heroNameColor) root.style.setProperty('--vp-home-hero-name-color', colors.home.heroNameColor)
root.style.setProperty('--vp-home-hero-name-background', colors.home.heroNameBackground) root.style.setProperty('--vp-home-hero-name-background', colors.home.heroNameBackground)
root.style.setProperty('--vp-home-hero-image-background-image', colors.home.heroImageBackground) root.style.setProperty('--vp-home-hero-image-background-image', colors.home.heroImageBackground)
root.style.setProperty('--vp-home-hero-image-filter', colors.home.heroImageFilter) root.style.setProperty('--vp-home-hero-image-filter', colors.home.heroImageFilter)
} else {
// Remove home hero color styles if theme doesn't specify them
root.style.removeProperty('--vp-home-hero-name-color')
root.style.removeProperty('--vp-home-hero-name-background')
root.style.removeProperty('--vp-home-hero-image-background-image')
root.style.removeProperty('--vp-home-hero-image-filter')
} }
// Apply fonts (if defined) if (theme.fonts?.body) root.style.setProperty('--vp-font-family-base', theme.fonts.body)
if (theme.fonts?.body) { if (theme.fonts?.heading) root.style.setProperty('--vp-font-family-heading', theme.fonts.heading)
root.style.setProperty('--vp-font-family-base', theme.fonts.body) if (theme.borderRadius) root.style.setProperty('--vp-border-radius', theme.borderRadius)
} else {
root.style.removeProperty('--vp-font-family-base')
}
if (theme.fonts?.heading) {
root.style.setProperty('--vp-font-family-heading', theme.fonts.heading)
} else {
root.style.removeProperty('--vp-font-family-heading')
}
// Apply border radius (if defined)
if (theme.borderRadius) {
root.style.setProperty('--vp-border-radius', theme.borderRadius)
} else {
root.style.removeProperty('--vp-border-radius')
}
// Apply spacing (if defined)
if (theme.spacing) { if (theme.spacing) {
if (theme.spacing.small) root.style.setProperty('--vp-spacing-small', theme.spacing.small) if (theme.spacing.small) root.style.setProperty('--vp-spacing-small', theme.spacing.small)
else root.style.removeProperty('--vp-spacing-small')
if (theme.spacing.medium) root.style.setProperty('--vp-spacing-medium', theme.spacing.medium) if (theme.spacing.medium) root.style.setProperty('--vp-spacing-medium', theme.spacing.medium)
else root.style.removeProperty('--vp-spacing-medium')
if (theme.spacing.large) root.style.setProperty('--vp-spacing-large', theme.spacing.large) if (theme.spacing.large) root.style.setProperty('--vp-spacing-large', theme.spacing.large)
else root.style.removeProperty('--vp-spacing-large')
} else {
root.style.removeProperty('--vp-spacing-small')
root.style.removeProperty('--vp-spacing-medium')
root.style.removeProperty('--vp-spacing-large')
} }
// Apply custom properties (if defined)
if (theme.customProperties) { if (theme.customProperties) {
Object.entries(theme.customProperties).forEach(([key, value]) => { Object.entries(theme.customProperties).forEach(([key, value]) => root.style.setProperty(key, value))
root.style.setProperty(key, value)
})
}
// Apply custom logo (if defined)
if (theme.logo) {
root.style.setProperty('--vp-theme-logo', `url(${theme.logo})`)
} else {
root.style.removeProperty('--vp-theme-logo')
} }
if (theme.logo) root.style.setProperty('--vp-theme-logo', `url(${theme.logo})`)
} }
public setTheme(themeName: string) { public setTheme(themeName: string) {
if (!themeRegistry[themeName]) { console.log('[ThemeHandler] setTheme called with:', themeName)
console.warn(`Theme "${themeName}" not found. Using christmas theme.`)
themeName = 'christmas'
const isStartup = typeof window !== 'undefined' && (Date.now() - this.initTime < 1000)
const isDefaultReset = themeName === 'color-swarm' || themeName === 'swarm'
const hasCustomThemeLoaded = !!this.state.value.theme
if (isStartup && isDefaultReset && hasCustomThemeLoaded) {
console.warn('[ThemeHandler] Blocked auto-reset to default theme during startup.')
return
} }
this.state.value.currentTheme = themeName if (themeRegistry[themeName]) {
this.state.value.theme = themeRegistry[themeName] this.state.value.currentTheme = themeName
localStorage.setItem(STORAGE_KEY_THEME, themeName) this.state.value.theme = themeRegistry[themeName]
this.applyTheme() localStorage.setItem(STORAGE_KEY_THEME, themeName)
this.applyTheme()
this.ensureColorPickerColors()
return
}
// Force re-apply ColorPicker colors if theme doesn't specify brand colors const cleanName = themeName.replace('color-', '')
this.ensureColorPickerColors() if (themeRegistry[cleanName]) {
this.state.value.currentTheme = cleanName
this.state.value.theme = themeRegistry[cleanName]
localStorage.setItem(STORAGE_KEY_THEME, cleanName)
this.applyTheme()
this.ensureColorPickerColors()
return
}
console.log('[ThemeHandler] Applying Preset:', cleanName)
this.state.value.currentTheme = cleanName
this.state.value.theme = null
localStorage.setItem(STORAGE_KEY_THEME, `color-${cleanName}`)
localStorage.setItem('preferred-color', cleanName)
this.applyTheme()
} }
public setMode(mode: DisplayMode) { public setMode(mode: DisplayMode) {
@ -284,10 +263,7 @@ export class ThemeHandler {
public toggleMode() { public toggleMode() {
const currentMode = this.state.value.currentMode const currentMode = this.state.value.currentMode
// Toggle between light and dark
const newMode: DisplayMode = currentMode === 'light' ? 'dark' : 'light' const newMode: DisplayMode = currentMode === 'light' ? 'dark' : 'light'
this.setMode(newMode) this.setMode(newMode)
} }
@ -297,65 +273,38 @@ export class ThemeHandler {
this.applyTheme() this.applyTheme()
} }
public getAmoledEnabled() { public getAmoledEnabled() { return this.amoledEnabled.value }
return this.amoledEnabled.value public toggleAmoled() { this.setAmoledEnabled(!this.amoledEnabled.value) }
} public getAmoledEnabledRef() { return this.amoledEnabled }
public toggleAmoled() {
this.setAmoledEnabled(!this.amoledEnabled.value)
}
public getAmoledEnabledRef() {
return this.amoledEnabled
}
private ensureColorPickerColors() { private ensureColorPickerColors() {
// If theme doesn't specify brand colors, force ColorPicker to reapply its selection
const currentMode = this.state.value.currentMode const currentMode = this.state.value.currentMode
const modeColors = this.state.value.theme.modes[currentMode] const theme = this.state.value.theme
if (!theme || !theme.modes || !theme.modes[currentMode]) return
const modeColors = theme.modes[currentMode]
if (!modeColors.brand || !modeColors.brand[1]) { if (!modeColors.brand || !modeColors.brand[1]) {
// Trigger a custom event that ColorPicker can listen to
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
window.dispatchEvent(new CustomEvent('theme-changed-apply-colors')) window.dispatchEvent(new CustomEvent('theme-changed-apply-colors'))
} }
} }
} }
public getState() { public getState() { return this.state }
return this.state public getMode() { return this.state.value.currentMode }
} public getTheme() { return this.state.value.currentTheme }
public getCurrentTheme() { return this.state.value.theme || ({} as Theme) }
public getMode() {
return this.state.value.currentMode
}
public getTheme() {
return this.state.value.currentTheme
}
public getCurrentTheme() {
return this.state.value.theme
}
public getAvailableThemes() { public getAvailableThemes() {
return Object.keys(themeRegistry).map(key => ({ return Object.keys(themeRegistry).map(key => ({
name: key, name: key,
displayName: themeRegistry[key].displayName displayName: themeRegistry[key].displayName
})) }))
} }
public isDarkMode() { return this.state.value.currentMode === 'dark' }
public isDarkMode() { public isAmoledMode() { return this.state.value.currentMode === 'dark' && this.amoledEnabled.value }
const mode = this.state.value.currentMode
return mode === 'dark'
}
public isAmoledMode() {
return this.state.value.currentMode === 'dark' && this.amoledEnabled.value
}
} }
// Global theme handler instance
let themeHandlerInstance: ThemeHandler | null = null let themeHandlerInstance: ThemeHandler | null = null
export function useThemeHandler() { export function useThemeHandler() {
@ -365,13 +314,11 @@ export function useThemeHandler() {
return themeHandlerInstance return themeHandlerInstance
} }
// Composable for use in Vue components
export function useTheme() { export function useTheme() {
const handler = useThemeHandler() const handler = useThemeHandler()
const state = handler.getState() const state = handler.getState()
onMounted(() => { onMounted(() => {
// Ensure theme is applied on mount
handler.applyTheme() handler.applyTheme()
}) })