diff --git a/publish/changeLog.md b/publish/changeLog.md index 730adfd..254657e 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,6 @@ +### 新增 + +- 新增棕色主题“泥牛入海” ### 修复 diff --git a/src/lang/en_us.json b/src/lang/en_us.json index 8b9d064..8417c4c 100644 --- a/src/lang/en_us.json +++ b/src/lang/en_us.json @@ -426,6 +426,7 @@ "theme_blue": "Blue", "theme_blue2": "Purple Blue", "theme_blue_plus": "Blue Plus", + "theme_brown": "Brown", "theme_china_ink": "China Ink", "theme_green": "Green", "theme_grey": "Grey", diff --git a/src/lang/zh_cn.json b/src/lang/zh_cn.json index d46789b..d510cec 100644 --- a/src/lang/zh_cn.json +++ b/src/lang/zh_cn.json @@ -426,6 +426,7 @@ "theme_blue": "蓝田生玉", "theme_blue2": "清热版蓝", "theme_blue_plus": "蛋雅深蓝", + "theme_brown": "泥牛入海", "theme_china_ink": "近墨者黑", "theme_green": "绿意盎然", "theme_grey": "灰常美丽", diff --git a/src/screens/Home/Views/Setting/settings/Theme/Theme.tsx b/src/screens/Home/Views/Setting/settings/Theme/Theme.tsx index 5af61b7..a1369a6 100644 --- a/src/screens/Home/Views/Setting/settings/Theme/Theme.tsx +++ b/src/screens/Home/Views/Setting/settings/Theme/Theme.tsx @@ -128,6 +128,7 @@ const styles = createStyle({ flexDirection: 'row', flexWrap: 'wrap', gap: 10, + marginTop: 5, }, item: { // marginRight: 15, diff --git a/src/theme/themes/createThemes.js b/src/theme/themes/createThemes.js index 201cabd..4ca4f5f 100644 --- a/src/theme/themes/createThemes.js +++ b/src/theme/themes/createThemes.js @@ -77,6 +77,24 @@ const defaultThemes = [ 'c-badge-tertiary': '#9ed458', }, }, + { + id: 'brown', + name: '泥牛入海', + isDark: false, + config: { + primary: 'rgba(188, 128, 68, 1)', + font: 'rgb(33, 33, 33)', + 'c-app-background': 'var(c-primary-light-600-alpha-700)', + 'c-main-background': 'rgba(255, 255, 255, 1)', + 'bg-image': '', + 'bg-image-position': 'center', + 'bg-image-size': 'cover', + + 'c-badge-primary': 'var(c-primary)', + 'c-badge-secondary': '#483472', + 'c-badge-tertiary': '#647D39', + }, + }, { id: 'red', name: '热情似火', diff --git a/src/theme/themes/themes.ts b/src/theme/themes/themes.ts index c48ff10..bb92012 100644 --- a/src/theme/themes/themes.ts +++ b/src/theme/themes/themes.ts @@ -1010,6 +1010,258 @@ export default [ } } }, + { + "id": "brown", + "name": "泥牛入海", + "isDark": false, + "isCustom": false, + "config": { + "themeColors": { + "c-primary": "rgba(188, 128, 68, 1)", + "c-primary-dark-100": "rgba(169,115,61, 1)", + "c-primary-dark-100-alpha-100": "rgba(169, 115, 61, 0.90)", + "c-primary-alpha-100": "rgba(188, 128, 68, 0.90)", + "c-primary-dark-100-alpha-200": "rgba(169, 115, 61, 0.80)", + "c-primary-alpha-200": "rgba(188, 128, 68, 0.80)", + "c-primary-dark-100-alpha-300": "rgba(169, 115, 61, 0.70)", + "c-primary-alpha-300": "rgba(188, 128, 68, 0.70)", + "c-primary-dark-100-alpha-400": "rgba(169, 115, 61, 0.60)", + "c-primary-alpha-400": "rgba(188, 128, 68, 0.60)", + "c-primary-dark-100-alpha-500": "rgba(169, 115, 61, 0.50)", + "c-primary-alpha-500": "rgba(188, 128, 68, 0.50)", + "c-primary-dark-100-alpha-600": "rgba(169, 115, 61, 0.40)", + "c-primary-alpha-600": "rgba(188, 128, 68, 0.40)", + "c-primary-dark-100-alpha-700": "rgba(169, 115, 61, 0.30)", + "c-primary-alpha-700": "rgba(188, 128, 68, 0.30)", + "c-primary-dark-100-alpha-800": "rgba(169, 115, 61, 0.20)", + "c-primary-alpha-800": "rgba(188, 128, 68, 0.20)", + "c-primary-dark-100-alpha-900": "rgba(169, 115, 61, 0.10)", + "c-primary-alpha-900": "rgba(188, 128, 68, 0.10)", + "c-primary-dark-200": "rgba(152,104,55, 1)", + "c-primary-dark-200-alpha-100": "rgba(152, 104, 55, 0.90)", + "c-primary-dark-200-alpha-200": "rgba(152, 104, 55, 0.80)", + "c-primary-dark-200-alpha-300": "rgba(152, 104, 55, 0.70)", + "c-primary-dark-200-alpha-400": "rgba(152, 104, 55, 0.60)", + "c-primary-dark-200-alpha-500": "rgba(152, 104, 55, 0.50)", + "c-primary-dark-200-alpha-600": "rgba(152, 104, 55, 0.40)", + "c-primary-dark-200-alpha-700": "rgba(152, 104, 55, 0.30)", + "c-primary-dark-200-alpha-800": "rgba(152, 104, 55, 0.20)", + "c-primary-dark-200-alpha-900": "rgba(152, 104, 55, 0.10)", + "c-primary-dark-300": "rgba(137,94,50, 1)", + "c-primary-dark-300-alpha-100": "rgba(137, 94, 50, 0.90)", + "c-primary-dark-300-alpha-200": "rgba(137, 94, 50, 0.80)", + "c-primary-dark-300-alpha-300": "rgba(137, 94, 50, 0.70)", + "c-primary-dark-300-alpha-400": "rgba(137, 94, 50, 0.60)", + "c-primary-dark-300-alpha-500": "rgba(137, 94, 50, 0.50)", + "c-primary-dark-300-alpha-600": "rgba(137, 94, 50, 0.40)", + "c-primary-dark-300-alpha-700": "rgba(137, 94, 50, 0.30)", + "c-primary-dark-300-alpha-800": "rgba(137, 94, 50, 0.20)", + "c-primary-dark-300-alpha-900": "rgba(137, 94, 50, 0.10)", + "c-primary-dark-400": "rgba(123,85,45, 1)", + "c-primary-dark-400-alpha-100": "rgba(123, 85, 45, 0.90)", + "c-primary-dark-400-alpha-200": "rgba(123, 85, 45, 0.80)", + "c-primary-dark-400-alpha-300": "rgba(123, 85, 45, 0.70)", + "c-primary-dark-400-alpha-400": "rgba(123, 85, 45, 0.60)", + "c-primary-dark-400-alpha-500": "rgba(123, 85, 45, 0.50)", + "c-primary-dark-400-alpha-600": "rgba(123, 85, 45, 0.40)", + "c-primary-dark-400-alpha-700": "rgba(123, 85, 45, 0.30)", + "c-primary-dark-400-alpha-800": "rgba(123, 85, 45, 0.20)", + "c-primary-dark-400-alpha-900": "rgba(123, 85, 45, 0.10)", + "c-primary-dark-500": "rgba(111,77,41, 1)", + "c-primary-dark-500-alpha-100": "rgba(111, 77, 41, 0.90)", + "c-primary-dark-500-alpha-200": "rgba(111, 77, 41, 0.80)", + "c-primary-dark-500-alpha-300": "rgba(111, 77, 41, 0.70)", + "c-primary-dark-500-alpha-400": "rgba(111, 77, 41, 0.60)", + "c-primary-dark-500-alpha-500": "rgba(111, 77, 41, 0.50)", + "c-primary-dark-500-alpha-600": "rgba(111, 77, 41, 0.40)", + "c-primary-dark-500-alpha-700": "rgba(111, 77, 41, 0.30)", + "c-primary-dark-500-alpha-800": "rgba(111, 77, 41, 0.20)", + "c-primary-dark-500-alpha-900": "rgba(111, 77, 41, 0.10)", + "c-primary-dark-600": "rgba(100,69,37, 1)", + "c-primary-dark-600-alpha-100": "rgba(100, 69, 37, 0.90)", + "c-primary-dark-600-alpha-200": "rgba(100, 69, 37, 0.80)", + "c-primary-dark-600-alpha-300": "rgba(100, 69, 37, 0.70)", + "c-primary-dark-600-alpha-400": "rgba(100, 69, 37, 0.60)", + "c-primary-dark-600-alpha-500": "rgba(100, 69, 37, 0.50)", + "c-primary-dark-600-alpha-600": "rgba(100, 69, 37, 0.40)", + "c-primary-dark-600-alpha-700": "rgba(100, 69, 37, 0.30)", + "c-primary-dark-600-alpha-800": "rgba(100, 69, 37, 0.20)", + "c-primary-dark-600-alpha-900": "rgba(100, 69, 37, 0.10)", + "c-primary-dark-700": "rgba(90,62,33, 1)", + "c-primary-dark-700-alpha-100": "rgba(90, 62, 33, 0.90)", + "c-primary-dark-700-alpha-200": "rgba(90, 62, 33, 0.80)", + "c-primary-dark-700-alpha-300": "rgba(90, 62, 33, 0.70)", + "c-primary-dark-700-alpha-400": "rgba(90, 62, 33, 0.60)", + "c-primary-dark-700-alpha-500": "rgba(90, 62, 33, 0.50)", + "c-primary-dark-700-alpha-600": "rgba(90, 62, 33, 0.40)", + "c-primary-dark-700-alpha-700": "rgba(90, 62, 33, 0.30)", + "c-primary-dark-700-alpha-800": "rgba(90, 62, 33, 0.20)", + "c-primary-dark-700-alpha-900": "rgba(90, 62, 33, 0.10)", + "c-primary-dark-800": "rgba(81,56,30, 1)", + "c-primary-dark-800-alpha-100": "rgba(81, 56, 30, 0.90)", + "c-primary-dark-800-alpha-200": "rgba(81, 56, 30, 0.80)", + "c-primary-dark-800-alpha-300": "rgba(81, 56, 30, 0.70)", + "c-primary-dark-800-alpha-400": "rgba(81, 56, 30, 0.60)", + "c-primary-dark-800-alpha-500": "rgba(81, 56, 30, 0.50)", + "c-primary-dark-800-alpha-600": "rgba(81, 56, 30, 0.40)", + "c-primary-dark-800-alpha-700": "rgba(81, 56, 30, 0.30)", + "c-primary-dark-800-alpha-800": "rgba(81, 56, 30, 0.20)", + "c-primary-dark-800-alpha-900": "rgba(81, 56, 30, 0.10)", + "c-primary-dark-900": "rgba(73,50,27, 1)", + "c-primary-dark-900-alpha-100": "rgba(73, 50, 27, 0.90)", + "c-primary-dark-900-alpha-200": "rgba(73, 50, 27, 0.80)", + "c-primary-dark-900-alpha-300": "rgba(73, 50, 27, 0.70)", + "c-primary-dark-900-alpha-400": "rgba(73, 50, 27, 0.60)", + "c-primary-dark-900-alpha-500": "rgba(73, 50, 27, 0.50)", + "c-primary-dark-900-alpha-600": "rgba(73, 50, 27, 0.40)", + "c-primary-dark-900-alpha-700": "rgba(73, 50, 27, 0.30)", + "c-primary-dark-900-alpha-800": "rgba(73, 50, 27, 0.20)", + "c-primary-dark-900-alpha-900": "rgba(73, 50, 27, 0.10)", + "c-primary-dark-1000": "rgba(66,45,24, 1)", + "c-primary-dark-1000-alpha-100": "rgba(66, 45, 24, 0.90)", + "c-primary-dark-1000-alpha-200": "rgba(66, 45, 24, 0.80)", + "c-primary-dark-1000-alpha-300": "rgba(66, 45, 24, 0.70)", + "c-primary-dark-1000-alpha-400": "rgba(66, 45, 24, 0.60)", + "c-primary-dark-1000-alpha-500": "rgba(66, 45, 24, 0.50)", + "c-primary-dark-1000-alpha-600": "rgba(66, 45, 24, 0.40)", + "c-primary-dark-1000-alpha-700": "rgba(66, 45, 24, 0.30)", + "c-primary-dark-1000-alpha-800": "rgba(66, 45, 24, 0.20)", + "c-primary-dark-1000-alpha-900": "rgba(66, 45, 24, 0.10)", + "c-primary-light-100": "rgba(201,153,105, 1)", + "c-primary-light-100-alpha-100": "rgba(201, 153, 105, 0.90)", + "c-primary-light-100-alpha-200": "rgba(201, 153, 105, 0.80)", + "c-primary-light-100-alpha-300": "rgba(201, 153, 105, 0.70)", + "c-primary-light-100-alpha-400": "rgba(201, 153, 105, 0.60)", + "c-primary-light-100-alpha-500": "rgba(201, 153, 105, 0.50)", + "c-primary-light-100-alpha-600": "rgba(201, 153, 105, 0.40)", + "c-primary-light-100-alpha-700": "rgba(201, 153, 105, 0.30)", + "c-primary-light-100-alpha-800": "rgba(201, 153, 105, 0.20)", + "c-primary-light-100-alpha-900": "rgba(201, 153, 105, 0.10)", + "c-primary-light-200": "rgba(212,173,135, 1)", + "c-primary-light-200-alpha-100": "rgba(212, 173, 135, 0.90)", + "c-primary-light-200-alpha-200": "rgba(212, 173, 135, 0.80)", + "c-primary-light-200-alpha-300": "rgba(212, 173, 135, 0.70)", + "c-primary-light-200-alpha-400": "rgba(212, 173, 135, 0.60)", + "c-primary-light-200-alpha-500": "rgba(212, 173, 135, 0.50)", + "c-primary-light-200-alpha-600": "rgba(212, 173, 135, 0.40)", + "c-primary-light-200-alpha-700": "rgba(212, 173, 135, 0.30)", + "c-primary-light-200-alpha-800": "rgba(212, 173, 135, 0.20)", + "c-primary-light-200-alpha-900": "rgba(212, 173, 135, 0.10)", + "c-primary-light-300": "rgba(221,189,159, 1)", + "c-primary-light-300-alpha-100": "rgba(221, 189, 159, 0.90)", + "c-primary-light-300-alpha-200": "rgba(221, 189, 159, 0.80)", + "c-primary-light-300-alpha-300": "rgba(221, 189, 159, 0.70)", + "c-primary-light-300-alpha-400": "rgba(221, 189, 159, 0.60)", + "c-primary-light-300-alpha-500": "rgba(221, 189, 159, 0.50)", + "c-primary-light-300-alpha-600": "rgba(221, 189, 159, 0.40)", + "c-primary-light-300-alpha-700": "rgba(221, 189, 159, 0.30)", + "c-primary-light-300-alpha-800": "rgba(221, 189, 159, 0.20)", + "c-primary-light-300-alpha-900": "rgba(221, 189, 159, 0.10)", + "c-primary-light-400": "rgba(228,202,178, 1)", + "c-primary-light-400-alpha-100": "rgba(228, 202, 178, 0.90)", + "c-primary-light-400-alpha-200": "rgba(228, 202, 178, 0.80)", + "c-primary-light-400-alpha-300": "rgba(228, 202, 178, 0.70)", + "c-primary-light-400-alpha-400": "rgba(228, 202, 178, 0.60)", + "c-primary-light-400-alpha-500": "rgba(228, 202, 178, 0.50)", + "c-primary-light-400-alpha-600": "rgba(228, 202, 178, 0.40)", + "c-primary-light-400-alpha-700": "rgba(228, 202, 178, 0.30)", + "c-primary-light-400-alpha-800": "rgba(228, 202, 178, 0.20)", + "c-primary-light-400-alpha-900": "rgba(228, 202, 178, 0.10)", + "c-primary-light-500": "rgba(233,213,193, 1)", + "c-primary-light-500-alpha-100": "rgba(233, 213, 193, 0.90)", + "c-primary-light-500-alpha-200": "rgba(233, 213, 193, 0.80)", + "c-primary-light-500-alpha-300": "rgba(233, 213, 193, 0.70)", + "c-primary-light-500-alpha-400": "rgba(233, 213, 193, 0.60)", + "c-primary-light-500-alpha-500": "rgba(233, 213, 193, 0.50)", + "c-primary-light-500-alpha-600": "rgba(233, 213, 193, 0.40)", + "c-primary-light-500-alpha-700": "rgba(233, 213, 193, 0.30)", + "c-primary-light-500-alpha-800": "rgba(233, 213, 193, 0.20)", + "c-primary-light-500-alpha-900": "rgba(233, 213, 193, 0.10)", + "c-primary-light-600": "rgba(237,221,205, 1)", + "c-primary-light-600-alpha-100": "rgba(237, 221, 205, 0.90)", + "c-primary-light-600-alpha-200": "rgba(237, 221, 205, 0.80)", + "c-primary-light-600-alpha-300": "rgba(237, 221, 205, 0.70)", + "c-primary-light-600-alpha-400": "rgba(237, 221, 205, 0.60)", + "c-primary-light-600-alpha-500": "rgba(237, 221, 205, 0.50)", + "c-primary-light-600-alpha-600": "rgba(237, 221, 205, 0.40)", + "c-primary-light-600-alpha-700": "rgba(237, 221, 205, 0.30)", + "c-primary-light-600-alpha-800": "rgba(237, 221, 205, 0.20)", + "c-primary-light-600-alpha-900": "rgba(237, 221, 205, 0.10)", + "c-primary-light-700": "rgba(241,228,215, 1)", + "c-primary-light-700-alpha-100": "rgba(241, 228, 215, 0.90)", + "c-primary-light-700-alpha-200": "rgba(241, 228, 215, 0.80)", + "c-primary-light-700-alpha-300": "rgba(241, 228, 215, 0.70)", + "c-primary-light-700-alpha-400": "rgba(241, 228, 215, 0.60)", + "c-primary-light-700-alpha-500": "rgba(241, 228, 215, 0.50)", + "c-primary-light-700-alpha-600": "rgba(241, 228, 215, 0.40)", + "c-primary-light-700-alpha-700": "rgba(241, 228, 215, 0.30)", + "c-primary-light-700-alpha-800": "rgba(241, 228, 215, 0.20)", + "c-primary-light-700-alpha-900": "rgba(241, 228, 215, 0.10)", + "c-primary-light-800": "rgba(244,233,223, 1)", + "c-primary-light-800-alpha-100": "rgba(244, 233, 223, 0.90)", + "c-primary-light-800-alpha-200": "rgba(244, 233, 223, 0.80)", + "c-primary-light-800-alpha-300": "rgba(244, 233, 223, 0.70)", + "c-primary-light-800-alpha-400": "rgba(244, 233, 223, 0.60)", + "c-primary-light-800-alpha-500": "rgba(244, 233, 223, 0.50)", + "c-primary-light-800-alpha-600": "rgba(244, 233, 223, 0.40)", + "c-primary-light-800-alpha-700": "rgba(244, 233, 223, 0.30)", + "c-primary-light-800-alpha-800": "rgba(244, 233, 223, 0.20)", + "c-primary-light-800-alpha-900": "rgba(244, 233, 223, 0.10)", + "c-primary-light-900": "rgba(246,237,229, 1)", + "c-primary-light-900-alpha-100": "rgba(246, 237, 229, 0.90)", + "c-primary-light-900-alpha-200": "rgba(246, 237, 229, 0.80)", + "c-primary-light-900-alpha-300": "rgba(246, 237, 229, 0.70)", + "c-primary-light-900-alpha-400": "rgba(246, 237, 229, 0.60)", + "c-primary-light-900-alpha-500": "rgba(246, 237, 229, 0.50)", + "c-primary-light-900-alpha-600": "rgba(246, 237, 229, 0.40)", + "c-primary-light-900-alpha-700": "rgba(246, 237, 229, 0.30)", + "c-primary-light-900-alpha-800": "rgba(246, 237, 229, 0.20)", + "c-primary-light-900-alpha-900": "rgba(246, 237, 229, 0.10)", + "c-primary-light-1000": "rgba(255,255,255, 1)", + "c-primary-light-1000-alpha-100": "rgba(255, 255, 255, 0.90)", + "c-primary-light-1000-alpha-200": "rgba(255, 255, 255, 0.80)", + "c-primary-light-1000-alpha-300": "rgba(255, 255, 255, 0.70)", + "c-primary-light-1000-alpha-400": "rgba(255, 255, 255, 0.60)", + "c-primary-light-1000-alpha-500": "rgba(255, 255, 255, 0.50)", + "c-primary-light-1000-alpha-600": "rgba(255, 255, 255, 0.40)", + "c-primary-light-1000-alpha-700": "rgba(255, 255, 255, 0.30)", + "c-primary-light-1000-alpha-800": "rgba(255, 255, 255, 0.20)", + "c-primary-light-1000-alpha-900": "rgba(255, 255, 255, 0.10)", + "c-theme": "rgba(188, 128, 68, 1)", + "c-1000": "rgb(33, 33, 33)", + "c-950": "rgb(44,44,44)", + "c-900": "rgb(55,55,55)", + "c-850": "rgb(66,66,66)", + "c-800": "rgb(77,77,77)", + "c-750": "rgb(89,89,89)", + "c-700": "rgb(100,100,100)", + "c-650": "rgb(111,111,111)", + "c-600": "rgb(122,122,122)", + "c-550": "rgb(133,133,133)", + "c-500": "rgb(144,144,144)", + "c-450": "rgb(155,155,155)", + "c-400": "rgb(166,166,166)", + "c-350": "rgb(177,177,177)", + "c-300": "rgb(188,188,188)", + "c-250": "rgb(200,200,200)", + "c-200": "rgb(211,211,211)", + "c-150": "rgb(222,222,222)", + "c-100": "rgb(233,233,233)", + "c-050": "rgb(244,244,244)", + "c-000": "rgb(255,255,255)" + }, + "extInfo": { + "c-app-background": "var(c-primary-light-600-alpha-700)", + "c-main-background": "rgba(255, 255, 255, 1)", + "bg-image": "", + "bg-image-position": "center", + "bg-image-size": "cover", + "c-badge-primary": "var(c-primary)", + "c-badge-secondary": "#483472", + "c-badge-tertiary": "#647D39" + } + } + }, { "id": "red", "name": "热情似火",