Skip to content

Commit 45adb3a

Browse files
committed
chore: update cartoon template
1 parent 2ae42ea commit 45adb3a

16 files changed

+111
-96
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@
9191
"lint-staged": "^15.2.10",
9292
"postcss": "^8",
9393
"tailwindcss": "^3.4.1",
94-
"typescript": "^5"
94+
"typescript": "^5",
95+
"vercel": "39.1.1"
9596
},
9697
"lint-staged": {
9798
"src/**/*.{ts,tsx}": [

pnpm-lock.yaml

+57-72
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/images/cartoon-star-inner.svg

+3
Loading
+3
Loading
Loading
File renamed without changes.
Loading
Loading
Loading
Loading
Loading

src/components/header/export-dialog.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ export function ExportImageDialog({
219219
</div>
220220
<div className="mt-4 sm:mt-auto ml-auto">
221221
<Button onClick={exportImages} disabled={previewImages.length === 0 || isExporting}>
222-
{isExporting ? (
222+
{previewImages.length === 0 || isExporting ? (
223223
<Loader2 className="w-4 h-4 mr-2 animate-spin" />
224224
) : (
225225
<Download className="w-4 h-4 mr-2" />

src/theme/index.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
cartoonBlue,
23
cartoonGreen,
34
cartoonPurple,
45
cartoonTemplate,
@@ -15,8 +16,8 @@ import type { ArticleModuleTemplate, ThemeColorItem } from '@/types'
1516

1617
export const DEFAULT_TEMPLATES = [
1718
{ label: '简约科技风格', value: 'wechat-post-1', disabled: false, template: techTemplate },
18-
{ label: '黑白苹果风格', value: 'apple-style', disabled: false, template: simpleTemplate },
19-
{ label: '卡通风格', value: 'cartoon-style', disabled: false, template: cartoonTemplate },
19+
{ label: '简约黑白风格', value: 'apple-style', disabled: false, template: simpleTemplate },
20+
{ label: '简约卡通风格', value: 'cartoon-style', disabled: false, template: cartoonTemplate },
2021
{ label: '更多模版尽情期待', value: 'post-more', disabled: true, template: null },
2122
] as const
2223

@@ -42,6 +43,7 @@ export const DEFAULT_THEME_COLOR_MAP: Record<string, ThemeColorItem[]> = {
4243
{ value: '#b38aef', label: 'purple', theme: cartoonPurple },
4344
{ value: '#cdea9c', label: 'green', theme: cartoonGreen },
4445
{ value: '#ffe97f', label: 'yellow', theme: cartoonYellow },
46+
{ value: '#516cf5', label: 'blue', theme: cartoonBlue },
4547
],
4648
'default': [
4749
{ value: '#4383ec', label: 'tech_blue', theme: techBlue },

src/theme/templates/cartoon-template/cartoon-color-variables.ts

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
import type { ThemeConfig } from '@/types'
22

3-
export const cartoonPurple: ThemeConfig = createCartoonThemeColor('#e3dceb', '#ffe36c', '#c0a1f1')
4-
export const cartoonGreen: ThemeConfig = createCartoonThemeColor('#cdea9c', '#ffe36c', '#99c64c')
5-
export const cartoonYellow: ThemeConfig = createCartoonThemeColor('#ffe97f', '#ffbf74', '#ff773d')
3+
export const cartoonPurple: ThemeConfig = createCartoonThemeColor('#e3dceb', '#000', '#ffe36c', '#c0a1f1', 'purple')
4+
export const cartoonGreen: ThemeConfig = createCartoonThemeColor('#cdea9c', '#000', '#ffe36c', '#99c64c', 'green')
5+
export const cartoonYellow: ThemeConfig = createCartoonThemeColor('#ffe97f', '#000', '#ffbf74', '#ff773d', 'yellow')
6+
export const cartoonBlue: ThemeConfig = createCartoonThemeColor('#516CF5', '#fff', '#FFCF4D', '#000', 'blue')
67

7-
function createCartoonThemeColor(containerBgColor: string, titleBgPrimaryColor: string, titleBgSecondaryColor: string) {
8+
function createCartoonThemeColor(containerBgColor: string, containerColor: string, titleBgPrimaryColor: string, titleBgSecondaryColor: string, starIconColor: string) {
89
return {
910
hero: {
1011
container: {
1112
background: containerBgColor,
12-
foreground: '#333',
13+
backgroundImageLeft: `url(/images/cartoon-star-left-${starIconColor}.svg)`,
14+
backgroundImageRight: `url(/images/cartoon-star-right-${starIconColor}.svg)`,
15+
foreground: containerColor,
1316
},
1417
title: {
1518
foreground: '#fff',
1619
background: 'transparent',
1720
},
1821
content: {
19-
foreground: '#000',
2022
background: 'transparent',
2123
},
2224
},

0 commit comments

Comments
 (0)