From 03ebe6b337943662aea7b2c4122eca687d31981c Mon Sep 17 00:00:00 2001
From: Land <84073086+LandWarderer2772@users.noreply.github.com>
Date: Sat, 1 Nov 2025 12:51:51 +0530
Subject: [PATCH 14/26] Update ColorPicker.vue
---
.../theme/components/ColorPicker.vue | 177 ++++++++----------
1 file changed, 80 insertions(+), 97 deletions(-)
diff --git a/docs/.vitepress/theme/components/ColorPicker.vue b/docs/.vitepress/theme/components/ColorPicker.vue
index 4760e2bdb..b59ae9d01 100644
--- a/docs/.vitepress/theme/components/ColorPicker.vue
+++ b/docs/.vitepress/theme/components/ColorPicker.vue
@@ -2,6 +2,7 @@
import { colors } from '@fmhy/colors'
import { useStorage, useStyleTag } from '@vueuse/core'
import { watch, onMounted } from 'vue'
+import Switch from './Switch.vue'
// Add Halloween colors
const halloweenColors = {
@@ -40,6 +41,7 @@ const colorScales = [
type ColorNames = keyof typeof extendedColors
const selectedColor = useStorage
('preferred-color', 'halloween')
+const isAmoledMode = useStorage('amoled-mode', false)
const colorOptions = Object.keys(extendedColors).filter(
(key) => typeof extendedColors[key as keyof typeof extendedColors] === 'object'
@@ -47,7 +49,7 @@ const colorOptions = Object.keys(extendedColors).filter(
const { css } = useStyleTag('', { id: 'brand-color' })
-const updateThemeColor = (colorName: ColorNames) => {
+const updateThemeColor = (colorName: ColorNames, amoledEnabled: boolean) => {
const colorSet = extendedColors[colorName]
const cssVars = colorScales
@@ -56,9 +58,30 @@ const updateThemeColor = (colorName: ColorNames) => {
const htmlElement = document.documentElement
+ // Manage theme classes
if (colorName === 'halloween') {
- // Apply Halloween theme
htmlElement.classList.add('theme-halloween')
+ } else {
+ htmlElement.classList.remove('theme-halloween')
+ }
+
+ if (amoledEnabled) {
+ htmlElement.classList.add('theme-amoled')
+ } else {
+ htmlElement.classList.remove('theme-amoled')
+ }
+
+ // Determine dark background color based on AMOLED mode
+ const darkBg = amoledEnabled ? '#000000' : 'rgb(26, 26, 26)'
+ const darkBgAlt = amoledEnabled ? '#000000' : 'rgb(23, 23, 23)'
+ const darkBgElv = amoledEnabled ? 'rgba(0, 0, 0, 0.9)' : 'rgba(23, 23, 23, 0.8)'
+ const darkBgSoft = amoledEnabled ? '#000000' : 'rgb(23, 23, 23)'
+
+ // Apply Halloween theme backgrounds or normal backgrounds
+ if (colorName === 'halloween') {
+ const halloweenDarkBg = amoledEnabled ? '#000000' : 'rgb(15, 15, 15)'
+ const halloweenDarkBgAlt = amoledEnabled ? '#000000' : 'rgb(12, 12, 12)'
+ const halloweenDarkBgElv = amoledEnabled ? 'rgba(0, 0, 0, 0.9)' : 'rgba(12, 12, 12, 0.8)'
css.value = `
:root {
@@ -75,12 +98,21 @@ const updateThemeColor = (colorName: ColorNames) => {
--vp-c-brand-2: ${colorSet[500]};
--vp-c-brand-3: ${colorSet[700]};
--vp-c-brand-soft: ${colorSet[300]};
+ --vp-c-bg: ${halloweenDarkBg} !important;
+ --vp-c-bg-alt: ${halloweenDarkBgAlt} !important;
+ --vp-c-bg-elv: ${halloweenDarkBgElv} !important;
+ --vp-c-bg-soft: ${halloweenDarkBgAlt} !important;
+ }
+
+ .dark html, .dark body {
+ background-color: ${halloweenDarkBg} !important;
+ }
+
+ .dark .VPApp, .dark .Layout, .dark .VPContent, .dark .VPHome, .dark .VPHero, .dark #app, .dark .vp-doc {
+ background-color: ${halloweenDarkBg} !important;
}
`
} else {
- // Remove Halloween theme and apply other theme with pure black backgrounds (but exclude buttons)
- htmlElement.classList.remove('theme-halloween')
-
css.value = `
:root {
${cssVars}
@@ -88,10 +120,10 @@ const updateThemeColor = (colorName: ColorNames) => {
--vp-c-brand-2: ${colorSet[600]};
--vp-c-brand-3: ${colorSet[800]};
--vp-c-brand-soft: ${colorSet[400]};
- --vp-c-bg: #000000 !important;
- --vp-c-bg-alt: #000000 !important;
- --vp-c-bg-elv: #000000 !important;
- --vp-c-bg-soft: #000000 !important;
+ --vp-c-bg: #ffffff !important;
+ --vp-c-bg-alt: #f9f9f9 !important;
+ --vp-c-bg-elv: rgba(255, 255, 255, 0.7) !important;
+ --vp-c-bg-soft: #f9f9f9 !important;
}
.dark {
@@ -100,114 +132,59 @@ const updateThemeColor = (colorName: ColorNames) => {
--vp-c-brand-2: ${colorSet[500]};
--vp-c-brand-3: ${colorSet[700]};
--vp-c-brand-soft: ${colorSet[300]};
- --vp-c-bg: #000000 !important;
- --vp-c-bg-alt: #000000 !important;
- --vp-c-bg-elv: #000000 !important;
- --vp-c-bg-soft: #000000 !important;
+ --vp-c-bg: ${darkBg} !important;
+ --vp-c-bg-alt: ${darkBgAlt} !important;
+ --vp-c-bg-elv: ${darkBgElv} !important;
+ --vp-c-bg-soft: ${darkBgSoft} !important;
}
- /* Main page backgrounds - pure black */
html, body {
- background-color: #000000 !important;
+ background-color: #ffffff !important;
}
- /* VitePress layout containers - pure black */
- .VPApp, .Layout, .VPContent, .VPHome, .VPHero, #app {
- background-color: #000000 !important;
+ .VPApp, .Layout, .VPContent, .VPHome, .VPHero, #app, .vp-doc {
+ background-color: #ffffff !important;
}
- /* Content areas - pure black */
- .vp-doc, .VPDoc, .content {
- background-color: #000000 !important;
- }
-
- /* Navigation and sidebar backgrounds - pure black */
- .VPNav, .VPSidebar, .VPLocalNav {
- background-color: #000000 !important;
- }
-
- /* Footer - pure black */
- .VPFooter {
- background-color: #000000 !important;
- }
-
- /* EXCLUDE buttons and interactive elements from black background */
- button,
- .VPButton,
- .vp-button,
- input[type="button"],
- input[type="submit"],
- .copy-button,
- .nav-link,
- .sidebar-link,
- .pager-link,
- .edit-link,
- .outline-link,
- .search-button,
- [role="button"] {
- background-color: initial !important;
- }
-
- /* Dark mode - same rules */
.dark html, .dark body {
- background-color: #000000 !important;
+ background-color: ${darkBg} !important;
}
- .dark .VPApp, .dark .Layout, .dark .VPContent, .dark .VPHome, .dark .VPHero, .dark #app {
- background-color: #000000 !important;
- }
-
- .dark .vp-doc, .dark .VPDoc, .dark .content {
- background-color: #000000 !important;
- }
-
- .dark .VPNav, .dark .VPSidebar, .dark .VPLocalNav {
- background-color: #000000 !important;
- }
-
- .dark .VPFooter {
- background-color: #000000 !important;
- }
-
- /* EXCLUDE buttons in dark mode too */
- .dark button,
- .dark .VPButton,
- .dark .vp-button,
- .dark input[type="button"],
- .dark input[type="submit"],
- .dark .copy-button,
- .dark .nav-link,
- .dark .sidebar-link,
- .dark .pager-link,
- .dark .edit-link,
- .dark .outline-link,
- .dark .search-button,
- .dark [role="button"] {
- background-color: initial !important;
+ .dark .VPApp, .dark .Layout, .dark .VPContent, .dark .VPHome, .dark .VPHero, .dark #app, .dark .vp-doc {
+ background-color: ${darkBg} !important;
}
`
}
}
-// Set Halloween theme ASAP if its the pref
-const storedTheme = localStorage.getItem('preferred-color')
-if (!storedTheme || storedTheme === '"halloween"') {
- document.documentElement.classList.add('theme-halloween')
-}
-
-// Initialize theme color
-updateThemeColor(selectedColor.value)
-
-// halloween stuff
onMounted(() => {
+ // Set Halloween theme ASAP if its the pref (only in browser)
+ if (typeof window !== 'undefined') {
+ const storedTheme = localStorage.getItem('preferred-color')
+ const storedAmoled = localStorage.getItem('amoled-mode')
+
+ if (!storedTheme || storedTheme === '"halloween"') {
+ document.documentElement.classList.add('theme-halloween')
+ }
+ if (storedAmoled === 'true') {
+ document.documentElement.classList.add('theme-amoled')
+ }
+ }
+
if (selectedColor.value === 'halloween') {
document.documentElement.classList.add('theme-halloween')
}
+ if (isAmoledMode.value) {
+ document.documentElement.classList.add('theme-amoled')
+ }
+
// Re-apply the theme to ensure everything is initialized
- updateThemeColor(selectedColor.value)
+ updateThemeColor(selectedColor.value, isAmoledMode.value)
})
-watch(selectedColor, updateThemeColor)
+watch([selectedColor, isAmoledMode], ([color, amoled]) => {
+ updateThemeColor(color, amoled)
+})
const normalizeColorName = (colorName: string) =>
colorName.replaceAll(/-/g, ' ').charAt(0).toUpperCase() +
@@ -219,7 +196,7 @@ const normalizeColorName = (colorName: string) =>
-
\ No newline at end of file
+
From 365a49425b7ed82789cffc7f6f1d0d7f327bdf76 Mon Sep 17 00:00:00 2001
From: Land <84073086+LandWarderer2772@users.noreply.github.com>
Date: Sat, 1 Nov 2025 12:53:27 +0530
Subject: [PATCH 15/26] Change default amoled mode to true
---
docs/.vitepress/theme/components/ColorPicker.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/.vitepress/theme/components/ColorPicker.vue b/docs/.vitepress/theme/components/ColorPicker.vue
index b59ae9d01..e0015d905 100644
--- a/docs/.vitepress/theme/components/ColorPicker.vue
+++ b/docs/.vitepress/theme/components/ColorPicker.vue
@@ -41,7 +41,7 @@ const colorScales = [
type ColorNames = keyof typeof extendedColors
const selectedColor = useStorage
('preferred-color', 'halloween')
-const isAmoledMode = useStorage('amoled-mode', false)
+const isAmoledMode = useStorage('amoled-mode', true)
const colorOptions = Object.keys(extendedColors).filter(
(key) => typeof extendedColors[key as keyof typeof extendedColors] === 'object'
From 94a8111b07c7f4d155c340b4ce5834e3c7eb8578 Mon Sep 17 00:00:00 2001
From: Land <84073086+LandWarderer2772@users.noreply.github.com>
Date: Sat, 1 Nov 2025 15:34:20 +0530
Subject: [PATCH 16/26] Update ColorPicker.vue
---
docs/.vitepress/theme/components/ColorPicker.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/.vitepress/theme/components/ColorPicker.vue b/docs/.vitepress/theme/components/ColorPicker.vue
index e0015d905..d90b3efef 100644
--- a/docs/.vitepress/theme/components/ColorPicker.vue
+++ b/docs/.vitepress/theme/components/ColorPicker.vue
@@ -224,7 +224,7 @@ const normalizeColorName = (colorName: string) =>
AMOLED
-
+
From b5a914db9f63ae3da9476ab923c5b486a8a5c603 Mon Sep 17 00:00:00 2001
From: Land <84073086+LandWarderer2772@users.noreply.github.com>
Date: Sat, 1 Nov 2025 14:51:53 +0000
Subject: [PATCH 17/26] fixing conflicts
---
.../theme/components/ColorPicker.vue | 187 +++++-------------
docs/.vitepress/theme/style.scss | 169 +---------------
2 files changed, 54 insertions(+), 302 deletions(-)
diff --git a/docs/.vitepress/theme/components/ColorPicker.vue b/docs/.vitepress/theme/components/ColorPicker.vue
index d90b3efef..50b78d12d 100644
--- a/docs/.vitepress/theme/components/ColorPicker.vue
+++ b/docs/.vitepress/theme/components/ColorPicker.vue
@@ -4,27 +4,6 @@ import { useStorage, useStyleTag } from '@vueuse/core'
import { watch, onMounted } from 'vue'
import Switch from './Switch.vue'
-// Add Halloween colors
-const halloweenColors = {
- 50: '#fff7ed',
- 100: '#ffedd5',
- 200: '#fed7aa',
- 300: '#fdba74',
- 400: '#fb923c',
- 500: '#FF6A00',
- 600: '#ea580c',
- 700: '#c2410c',
- 800: '#9a3412',
- 900: '#7c2d12',
- 950: '#431407'
-}
-
-// hall extend or something
-const extendedColors = {
- ...colors,
- halloween: halloweenColors
-}
-
const colorScales = [
'50',
'100',
@@ -39,18 +18,18 @@ const colorScales = [
'950'
] as const
-type ColorNames = keyof typeof extendedColors
-const selectedColor = useStorage('preferred-color', 'halloween')
+type ColorNames = keyof typeof colors
+const selectedColor = useStorage('preferred-color', 'swarm')
const isAmoledMode = useStorage('amoled-mode', true)
-const colorOptions = Object.keys(extendedColors).filter(
- (key) => typeof extendedColors[key as keyof typeof extendedColors] === 'object'
+const colorOptions = Object.keys(colors).filter(
+ (key) => typeof colors[key as keyof typeof colors] === 'object'
) as Array
const { css } = useStyleTag('', { id: 'brand-color' })
const updateThemeColor = (colorName: ColorNames, amoledEnabled: boolean) => {
- const colorSet = extendedColors[colorName]
+ const colorSet = colors[colorName]
const cssVars = colorScales
.map((scale) => `--vp-c-brand-${scale}: ${colorSet[scale]};`)
@@ -58,122 +37,61 @@ const updateThemeColor = (colorName: ColorNames, amoledEnabled: boolean) => {
const htmlElement = document.documentElement
- // Manage theme classes
- if (colorName === 'halloween') {
- htmlElement.classList.add('theme-halloween')
- } else {
- htmlElement.classList.remove('theme-halloween')
- }
-
if (amoledEnabled) {
htmlElement.classList.add('theme-amoled')
} else {
htmlElement.classList.remove('theme-amoled')
}
- // Determine dark background color based on AMOLED mode
const darkBg = amoledEnabled ? '#000000' : 'rgb(26, 26, 26)'
const darkBgAlt = amoledEnabled ? '#000000' : 'rgb(23, 23, 23)'
const darkBgElv = amoledEnabled ? 'rgba(0, 0, 0, 0.9)' : 'rgba(23, 23, 23, 0.8)'
const darkBgSoft = amoledEnabled ? '#000000' : 'rgb(23, 23, 23)'
- // Apply Halloween theme backgrounds or normal backgrounds
- if (colorName === 'halloween') {
- const halloweenDarkBg = amoledEnabled ? '#000000' : 'rgb(15, 15, 15)'
- const halloweenDarkBgAlt = amoledEnabled ? '#000000' : 'rgb(12, 12, 12)'
- const halloweenDarkBgElv = amoledEnabled ? 'rgba(0, 0, 0, 0.9)' : 'rgba(12, 12, 12, 0.8)'
+ css.value = `
+ :root {
+ ${cssVars}
+ --vp-c-brand-1: ${colorSet[500]};
+ --vp-c-brand-2: ${colorSet[600]};
+ --vp-c-brand-3: ${colorSet[800]};
+ --vp-c-brand-soft: ${colorSet[400]};
+ --vp-c-bg: #ffffff !important;
+ --vp-c-bg-alt: #f9f9f9 !important;
+ --vp-c-bg-elv: rgba(255, 255, 255, 0.7) !important;
+ --vp-c-bg-soft: #f9f9f9 !important;
+ }
+
+ .dark {
+ ${cssVars}
+ --vp-c-brand-1: ${colorSet[400]};
+ --vp-c-brand-2: ${colorSet[500]};
+ --vp-c-brand-3: ${colorSet[700]};
+ --vp-c-brand-soft: ${colorSet[300]};
+ --vp-c-bg: ${darkBg} !important;
+ --vp-c-bg-alt: ${darkBgAlt} !important;
+ --vp-c-bg-elv: ${darkBgElv} !important;
+ --vp-c-bg-soft: ${darkBgSoft} !important;
+ }
- css.value = `
- :root {
- ${cssVars}
- --vp-c-brand-1: ${colorSet[500]};
- --vp-c-brand-2: ${colorSet[600]};
- --vp-c-brand-3: ${colorSet[800]};
- --vp-c-brand-soft: ${colorSet[400]};
- }
-
- .dark {
- ${cssVars}
- --vp-c-brand-1: ${colorSet[400]};
- --vp-c-brand-2: ${colorSet[500]};
- --vp-c-brand-3: ${colorSet[700]};
- --vp-c-brand-soft: ${colorSet[300]};
- --vp-c-bg: ${halloweenDarkBg} !important;
- --vp-c-bg-alt: ${halloweenDarkBgAlt} !important;
- --vp-c-bg-elv: ${halloweenDarkBgElv} !important;
- --vp-c-bg-soft: ${halloweenDarkBgAlt} !important;
- }
-
- .dark html, .dark body {
- background-color: ${halloweenDarkBg} !important;
- }
-
- .dark .VPApp, .dark .Layout, .dark .VPContent, .dark .VPHome, .dark .VPHero, .dark #app, .dark .vp-doc {
- background-color: ${halloweenDarkBg} !important;
- }
- `
- } else {
- css.value = `
- :root {
- ${cssVars}
- --vp-c-brand-1: ${colorSet[500]};
- --vp-c-brand-2: ${colorSet[600]};
- --vp-c-brand-3: ${colorSet[800]};
- --vp-c-brand-soft: ${colorSet[400]};
- --vp-c-bg: #ffffff !important;
- --vp-c-bg-alt: #f9f9f9 !important;
- --vp-c-bg-elv: rgba(255, 255, 255, 0.7) !important;
- --vp-c-bg-soft: #f9f9f9 !important;
- }
-
- .dark {
- ${cssVars}
- --vp-c-brand-1: ${colorSet[400]};
- --vp-c-brand-2: ${colorSet[500]};
- --vp-c-brand-3: ${colorSet[700]};
- --vp-c-brand-soft: ${colorSet[300]};
- --vp-c-bg: ${darkBg} !important;
- --vp-c-bg-alt: ${darkBgAlt} !important;
- --vp-c-bg-elv: ${darkBgElv} !important;
- --vp-c-bg-soft: ${darkBgSoft} !important;
- }
-
- html, body {
- background-color: #ffffff !important;
- }
-
- .VPApp, .Layout, .VPContent, .VPHome, .VPHero, #app, .vp-doc {
- background-color: #ffffff !important;
- }
-
- .dark html, .dark body {
- background-color: ${darkBg} !important;
- }
-
- .dark .VPApp, .dark .Layout, .dark .VPContent, .dark .VPHome, .dark .VPHero, .dark #app, .dark .vp-doc {
- background-color: ${darkBg} !important;
- }
- `
- }
+ html, body {
+ background-color: #ffffff !important;
+ }
+
+ .VPApp, .Layout, .VPContent, .VPHome, .VPHero, #app, .vp-doc {
+ background-color: #ffffff !important;
+ }
+
+ .dark html, .dark body {
+ background-color: ${darkBg} !important;
+ }
+
+ .dark .VPApp, .dark .Layout, .dark .VPContent, .dark .VPHome, .dark .VPHero, .dark #app, .vp-doc {
+ background-color: ${darkBg} !important;
+ }
+ `
}
onMounted(() => {
- // Set Halloween theme ASAP if its the pref (only in browser)
- if (typeof window !== 'undefined') {
- const storedTheme = localStorage.getItem('preferred-color')
- const storedAmoled = localStorage.getItem('amoled-mode')
-
- if (!storedTheme || storedTheme === '"halloween"') {
- document.documentElement.classList.add('theme-halloween')
- }
- if (storedAmoled === 'true') {
- document.documentElement.classList.add('theme-amoled')
- }
- }
-
- if (selectedColor.value === 'halloween') {
- document.documentElement.classList.add('theme-halloween')
- }
if (isAmoledMode.value) {
document.documentElement.classList.add('theme-amoled')
}
@@ -203,16 +121,9 @@ const normalizeColorName = (colorName: string) =>
:title="normalizeColorName(color)"
>
- 🎃
-
-
+ :style="{ backgroundColor: colors[color][500] }"
+ >