diff --git a/packages/theme/src/v2/CHANGELOG.md b/packages/theme/src/v2/CHANGELOG.md index 4ae4d06..4e0e9b9 100644 --- a/packages/theme/src/v2/CHANGELOG.md +++ b/packages/theme/src/v2/CHANGELOG.md @@ -1276,4 +1276,34 @@ None - `edgelessToolbar/penEraser/eraserBlue-2` - dark: `#d0dfe5` → `#a1c5d3` - `loading/background` - - dark: `#ffffffd1` → `#ffffff21` \ No newline at end of file + - dark: `#ffffffd1` → `#ffffff21` + +# 2025-4-25 12:1 +### New + +- `button/actionActive` + - light: `#1e96eb14` + - dark: `#ffffff0d` +- `icon/monotone` + - light: `#7a7a7a` + - dark: `#7a7a7a` +- `layer/background/linkedDocOnEdgeless` + - light: `#ffffff` + - dark: `#252525` +- `loading/backgroundLayer` + - light: `#9292921a` + - dark: `#929292e5` +- `pagelist/hoverBorder` + - light: `#e6e6e6` + - dark: `#7a7a7a` + +### Removed + +None + +### Updated + +- `layer/background/codeBlock` + - light: `#f9f9f9` → `#f5f5f5` +- `edgeless/note/white` + - dark: `#000000` → `#252525` \ No newline at end of file diff --git a/packages/theme/src/v2/source/variables.json b/packages/theme/src/v2/source/variables.json index a96dcce..8a02f43 100644 --- a/packages/theme/src/v2/source/variables.json +++ b/packages/theme/src/v2/source/variables.json @@ -260,6 +260,12 @@ "var": "Red/600", "rootAlias": "Red/600" }, + { + "name": "Button/actionActive", + "value": "#1e96eb14", + "var": "Transparent/AFFiNE Blue/800 (8%)", + "rootAlias": "Transparent/AFFiNE Blue/800 (8%)" + }, { "name": "Button/badgesColor", "value": "#ed3f3f", @@ -1472,6 +1478,12 @@ "var": "Grey/300", "rootAlias": "Grey/300" }, + { + "name": "Icon/monotone", + "value": "#7a7a7a", + "var": "Grey/600", + "rootAlias": "Grey/600" + }, { "name": "Icon/primary", "value": "#7a7a7a", @@ -1630,9 +1642,9 @@ }, { "name": "Layer/background/codeBlock", - "value": "#f9f9f9", - "var": "Grey/25", - "rootAlias": "Grey/25" + "value": "#f5f5f5", + "var": "Grey/50", + "rootAlias": "Grey/50" }, { "name": "Layer/background/error", @@ -1646,6 +1658,12 @@ "var": "Transparent/black/50 (5%)", "rootAlias": "Transparent/black/50 (5%)" }, + { + "name": "Layer/background/linkedDocOnEdgeless", + "value": "#ffffff", + "var": "Base/White", + "rootAlias": "Base/White" + }, { "name": "Layer/background/modal", "value": "#000000b2", @@ -1742,6 +1760,12 @@ "var": "Transparent/black/200 (10%)", "rootAlias": "Transparent/black/200 (10%)" }, + { + "name": "Loading/backgroundLayer", + "value": "#9292921a", + "var": "Transparent/grey/200 (10%)", + "rootAlias": "Transparent/grey/200 (10%)" + }, { "name": "Loading/foreground", "value": "#1e96eb", @@ -1760,6 +1784,12 @@ "var": "Yellow/600", "rootAlias": "Yellow/600" }, + { + "name": "Pagelist/hoverBorder", + "value": "#e6e6e6", + "var": "Grey/200", + "rootAlias": "Grey/200" + }, { "name": "Portrait/localPortrait", "value": "#00000038", @@ -2162,12 +2192,54 @@ "var": "Others/Shadow/14(black)", "rootAlias": "Others/Shadow/14(black)" }, + { + "name": "Shadow/NoteShadow/filmShadow/1-color", + "value": "#000000", + "var": "Base/Black", + "rootAlias": "Base/Black" + }, + { + "name": "Shadow/NoteShadow/filmShadow/2-color", + "value": "#000000", + "var": "Base/Black", + "rootAlias": "Base/Black" + }, + { + "name": "Shadow/NoteShadow/floatShadow/1-color", + "value": "#00000017", + "var": "Others/Shadow/9(black)", + "rootAlias": "Others/Shadow/9(black)" + }, + { + "name": "Shadow/NoteShadow/floatShadow/2-color", + "value": "#0000001a", + "var": "Others/Shadow/10(black)", + "rootAlias": "Others/Shadow/10(black)" + }, { "name": "Shadow/NoteShadow/noteActiveShadow/Color", "value": "#ffffff", "var": "", "rootAlias": "" }, + { + "name": "Shadow/NoteShadow/paperShadow/1-color", + "value": "#ffffff", + "var": "Base/White", + "rootAlias": "Base/White" + }, + { + "name": "Shadow/NoteShadow/paperShadow/2-color", + "value": "#00000024", + "var": "Others/Shadow/14(black)", + "rootAlias": "Others/Shadow/14(black)" + }, + { + "name": "Shadow/NoteShadow/paperShadow/3-color", + "value": "#0000000d", + "var": "Others/Shadow/5(black)", + "rootAlias": "Others/Shadow/5(black)" + }, { "name": "Shadow/NoteShadow/stickerShadow/1-color", "value": "#00000029", @@ -2866,6 +2938,90 @@ "var": "", "rootAlias": "" }, + { + "name": "Shadow/NoteShadow/filmShadow/1-spead", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/filmShadow/1-x", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/filmShadow/1-y", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/filmShadow/2-spread", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/floatShadow/1-blur", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/floatShadow/1-y", + "value": "NaNrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/floatShadow/2-blur", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/floatShadow/2-y", + "value": "NaNrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/1-spread", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/2-blur", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/2-spread", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/2-y", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/3-blur", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/3-y", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, { "name": "Shadow/NoteShadow/stickerShadow/1-spread", "value": "-Infinityrem", @@ -3289,6 +3445,12 @@ "var": "Red/600", "rootAlias": "Red/600" }, + { + "name": "Button/actionActive", + "value": "#ffffff0d", + "var": "Transparent/white/50 (5%)", + "rootAlias": "Transparent/white/50 (5%)" + }, { "name": "Button/badgesColor", "value": "#c83030", @@ -3957,9 +4119,9 @@ }, { "name": "Edgeless/note/white", - "value": "#000000", - "var": "Base/Black", - "rootAlias": "Base/Black" + "value": "#252525", + "var": "Grey/900", + "rootAlias": "Grey/900" }, { "name": "Edgeless/note/yellow", @@ -4501,6 +4663,12 @@ "var": "Grey/700", "rootAlias": "Grey/700" }, + { + "name": "Icon/monotone", + "value": "#7a7a7a", + "var": "Grey/600", + "rootAlias": "Grey/600" + }, { "name": "Icon/primary", "value": "#f3f3f3", @@ -4675,6 +4843,12 @@ "var": "Transparent/white/100 (9%)", "rootAlias": "Transparent/white/100 (9%)" }, + { + "name": "Layer/background/linkedDocOnEdgeless", + "value": "#252525", + "var": "Grey/900", + "rootAlias": "Grey/900" + }, { "name": "Layer/background/modal", "value": "#00000085", @@ -4771,6 +4945,12 @@ "var": "Transparent/white/200 (13%)", "rootAlias": "Transparent/white/200 (13%)" }, + { + "name": "Loading/backgroundLayer", + "value": "#929292e5", + "var": "Transparent/grey/900 (90%)", + "rootAlias": "Transparent/grey/900 (90%)" + }, { "name": "Loading/foreground", "value": "#0077cb", @@ -4789,6 +4969,12 @@ "var": "Yellow/600", "rootAlias": "Yellow/600" }, + { + "name": "Pagelist/hoverBorder", + "value": "#7a7a7a", + "var": "Grey/600", + "rootAlias": "Grey/600" + }, { "name": "Portrait/localPortrait", "value": "#ffffff3b", @@ -5181,9 +5367,9 @@ }, { "name": "Shadow/NoteShadow/boxShadow/1-color", - "value": "#00000066", - "var": "Others/Shadow/40(black)", - "rootAlias": "Others/Shadow/40(black)" + "value": "#ffffff70", + "var": "Others/Gradient/44(white)", + "rootAlias": "Others/Gradient/44(white)" }, { "name": "Shadow/NoteShadow/boxShadow/2-color", @@ -5191,6 +5377,30 @@ "var": "Others/Shadow/30(black)", "rootAlias": "Others/Shadow/30(black)" }, + { + "name": "Shadow/NoteShadow/filmShadow/1-color", + "value": "#7a7a7a", + "var": "Grey/600", + "rootAlias": "Grey/600" + }, + { + "name": "Shadow/NoteShadow/filmShadow/2-color", + "value": "#7a7a7a", + "var": "Grey/600", + "rootAlias": "Grey/600" + }, + { + "name": "Shadow/NoteShadow/floatShadow/1-color", + "value": "#0000004d", + "var": "Others/Shadow/30(black)", + "rootAlias": "Others/Shadow/30(black)" + }, + { + "name": "Shadow/NoteShadow/floatShadow/2-color", + "value": "#ffffff70", + "var": "Others/Gradient/44(white)", + "rootAlias": "Others/Gradient/44(white)" + }, { "name": "Shadow/NoteShadow/noteActiveShadow/Color", "value": "#ffffff", @@ -5198,16 +5408,34 @@ "rootAlias": "" }, { - "name": "Shadow/NoteShadow/stickerShadow/1-color", + "name": "Shadow/NoteShadow/paperShadow/1-color", + "value": "#7a7a7a", + "var": "Grey/600", + "rootAlias": "Grey/600" + }, + { + "name": "Shadow/NoteShadow/paperShadow/2-color", + "value": "#0000004d", + "var": "Others/Shadow/30(black)", + "rootAlias": "Others/Shadow/30(black)" + }, + { + "name": "Shadow/NoteShadow/paperShadow/3-color", "value": "#0000004d", "var": "Others/Shadow/30(black)", "rootAlias": "Others/Shadow/30(black)" }, + { + "name": "Shadow/NoteShadow/stickerShadow/1-color", + "value": "#00000085", + "var": "Transparent/black/500 (52%)", + "rootAlias": "Transparent/black/500 (52%)" + }, { "name": "Shadow/NoteShadow/stickerShadow/2-color", - "value": "#0000001f", - "var": "Others/Shadow/12(black)", - "rootAlias": "Others/Shadow/12(black)" + "value": "#00000038", + "var": "Others/Shadow/22(black)", + "rootAlias": "Others/Shadow/22(black)" }, { "name": "Shadow/activeShadow/Color", @@ -5895,6 +6123,90 @@ "var": "", "rootAlias": "" }, + { + "name": "Shadow/NoteShadow/filmShadow/1-spead", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/filmShadow/1-x", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/filmShadow/1-y", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/filmShadow/2-spread", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/floatShadow/1-blur", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/floatShadow/1-y", + "value": "NaNrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/floatShadow/2-blur", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/floatShadow/2-y", + "value": "NaNrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/1-spread", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/2-blur", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/2-spread", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/2-y", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/3-blur", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, + { + "name": "Shadow/NoteShadow/paperShadow/3-y", + "value": "Infinityrem", + "var": "", + "rootAlias": "" + }, { "name": "Shadow/NoteShadow/stickerShadow/1-spread", "value": "-Infinityrem", diff --git a/packages/theme/src/v2/variables.ts b/packages/theme/src/v2/variables.ts index 7224e30..b220675 100644 --- a/packages/theme/src/v2/variables.ts +++ b/packages/theme/src/v2/variables.ts @@ -45,6 +45,7 @@ export const lightThemeV2 = { 'block/recordBlock/primary': '#f45353', 'block/recordBlock/secordary': '#ff9a9a', 'block/recordBlock/timelineIndeicator': '#ed3f3f', + 'button/actionActive': '#1e96eb14', 'button/badgesColor': '#ed3f3f', 'button/buttonOverHover': '#ffffff', 'button/checkBox': '#1e96eb', @@ -247,6 +248,7 @@ export const lightThemeV2 = { 'icon/activated': '#1e96eb', 'icon/disable': '#b3b3b3', 'icon/fileIconBorder': '#cdcdcd', + 'icon/monotone': '#7a7a7a', 'icon/primary': '#7a7a7a', 'icon/secondary': '#b3b3b3', 'icon/tertiary': '#cdcdcd', @@ -273,9 +275,10 @@ export const lightThemeV2 = { 'layer/insideBorder/primaryBorder': '#1e96eb', 'layer/insideBorder/splitviewActived': '#0000002b', 'layer/insideBorder/whiteBorder': '#ffffff8f', - 'layer/background/codeBlock': '#f9f9f9', + 'layer/background/codeBlock': '#f5f5f5', 'layer/background/error': '#fff1f1', 'layer/background/hoverOverlay': '#0000000d', + 'layer/background/linkedDocOnEdgeless': '#ffffff', 'layer/background/modal': '#000000b2', 'layer/background/modalWhite': '#ffffff2b', 'layer/background/overlayPanel': '#ffffff', @@ -292,9 +295,11 @@ export const lightThemeV2 = { 'layer/background/mobile/secondary': '#ffffff', 'layer/background/mobile/tertiary': '#e6e6e6', 'loading/background': '#0000001a', + 'loading/backgroundLayer': '#9292921a', 'loading/foreground': '#1e96eb', 'others/warnLabel/black': '#000000', 'others/warnLabel/yellow': '#facc15', + 'pagelist/hoverBorder': '#e6e6e6', 'portrait/localPortrait': '#00000038', 'portrait/localPortraitBackground': '#0000001a', 'radio/disable': '#cdcdcd', @@ -466,6 +471,7 @@ export const darkThemeV2 = { 'block/recordBlock/primary': '#f45353', 'block/recordBlock/secordary': '#c83030', 'block/recordBlock/timelineIndeicator': '#ed3f3f', + 'button/actionActive': '#ffffff0d', 'button/badgesColor': '#c83030', 'button/buttonOverHover': '#414141', 'button/checkBox': '#1e96eb', @@ -577,7 +583,7 @@ export const darkThemeV2 = { 'edgeless/note/purple': '#312e81', 'edgeless/note/red': '#460606', 'edgeless/note/teal': '#0e4841', - 'edgeless/note/white': '#000000', + 'edgeless/note/white': '#252525', 'edgeless/note/yellow': '#704200', 'edgeless/palette/black': '#ffffff', 'edgeless/palette/white': '#000000', @@ -668,6 +674,7 @@ export const darkThemeV2 = { 'icon/activated': '#1e96eb', 'icon/disable': '#414141', 'icon/fileIconBorder': '#565656', + 'icon/monotone': '#7a7a7a', 'icon/primary': '#f3f3f3', 'icon/secondary': '#cdcdcd', 'icon/tertiary': '#565656', @@ -697,6 +704,7 @@ export const darkThemeV2 = { 'layer/background/codeBlock': '#252525', 'layer/background/error': '#460606', 'layer/background/hoverOverlay': '#ffffff17', + 'layer/background/linkedDocOnEdgeless': '#252525', 'layer/background/modal': '#00000085', 'layer/background/modalWhite': '#ffffff2b', 'layer/background/overlayPanel': '#252525', @@ -713,9 +721,11 @@ export const darkThemeV2 = { 'layer/background/mobile/secondary': '#252525', 'layer/background/mobile/tertiary': '#414141', 'loading/background': '#ffffff21', + 'loading/backgroundLayer': '#929292e5', 'loading/foreground': '#0077cb', 'others/warnLabel/black': '#000000', 'others/warnLabel/yellow': '#facc15', + 'pagelist/hoverBorder': '#7a7a7a', 'portrait/localPortrait': '#ffffff3b', 'portrait/localPortraitBackground': '#ffffff2b', 'radio/disable': '#7a7a7a', @@ -900,6 +910,7 @@ export const nestedLightTheme = { }, }, button: { + actionActive: '#1e96eb14', badgesColor: '#ed3f3f', buttonOverHover: '#ffffff', checkBox: '#1e96eb', @@ -1145,6 +1156,7 @@ export const nestedLightTheme = { activated: '#1e96eb', disable: '#b3b3b3', fileIconBorder: '#cdcdcd', + monotone: '#7a7a7a', primary: '#7a7a7a', secondary: '#b3b3b3', tertiary: '#cdcdcd', @@ -1178,9 +1190,10 @@ export const nestedLightTheme = { whiteBorder: '#ffffff8f', }, background: { - codeBlock: '#f9f9f9', + codeBlock: '#f5f5f5', error: '#fff1f1', hoverOverlay: '#0000000d', + linkedDocOnEdgeless: '#ffffff', modal: '#000000b2', modalWhite: '#ffffff2b', overlayPanel: '#ffffff', @@ -1200,8 +1213,13 @@ export const nestedLightTheme = { }, }, }, - loading: { background: '#0000001a', foreground: '#1e96eb' }, + loading: { + background: '#0000001a', + backgroundLayer: '#9292921a', + foreground: '#1e96eb', + }, others: { warnLabel: { black: '#000000', yellow: '#facc15' } }, + pagelist: { hoverBorder: '#e6e6e6' }, portrait: { localPortrait: '#00000038', localPortraitBackground: '#0000001a', @@ -1408,6 +1426,7 @@ export const nestedDarkTheme = { }, }, button: { + actionActive: '#ffffff0d', badgesColor: '#c83030', buttonOverHover: '#414141', checkBox: '#1e96eb', @@ -1540,7 +1559,7 @@ export const nestedDarkTheme = { purple: '#312e81', red: '#460606', teal: '#0e4841', - white: '#000000', + white: '#252525', yellow: '#704200', }, palette: { @@ -1653,6 +1672,7 @@ export const nestedDarkTheme = { activated: '#1e96eb', disable: '#414141', fileIconBorder: '#565656', + monotone: '#7a7a7a', primary: '#f3f3f3', secondary: '#cdcdcd', tertiary: '#565656', @@ -1689,6 +1709,7 @@ export const nestedDarkTheme = { codeBlock: '#252525', error: '#460606', hoverOverlay: '#ffffff17', + linkedDocOnEdgeless: '#252525', modal: '#00000085', modalWhite: '#ffffff2b', overlayPanel: '#252525', @@ -1708,8 +1729,13 @@ export const nestedDarkTheme = { }, }, }, - loading: { background: '#ffffff21', foreground: '#0077cb' }, + loading: { + background: '#ffffff21', + backgroundLayer: '#929292e5', + foreground: '#0077cb', + }, others: { warnLabel: { black: '#000000', yellow: '#facc15' } }, + pagelist: { hoverBorder: '#7a7a7a' }, portrait: { localPortrait: '#ffffff3b', localPortraitBackground: '#ffffff2b',