Skip to content

Commit 33dceff

Browse files
committed
chore: release v1.3.0
1 parent 653afa1 commit 33dceff

File tree

3 files changed

+151
-18
lines changed

3 files changed

+151
-18
lines changed

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Maple",
3-
"version": "1.2.5",
3+
"version": "1.3.0",
44
"minAppVersion": "1.1.9",
55
"author": "subframe7536",
66
"authorUrl": "https://github.com/subframe7536"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "maple",
3-
"version": "1.2.5",
3+
"version": "1.3.0",
44
"type": "module",
55
"author": "subframe7536",
66
"scripts": {

theme.css

Lines changed: 149 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Maple Theme v1.2.5 For Obsidian */
1+
/* Maple Theme v1.3.0 For Obsidian */
22
/* @settings
33
id: maple-basic
44
name: Maple Basic
@@ -91,6 +91,46 @@ settings:
9191
default: "#"
9292
format: hsl-split
9393
opacity: false
94+
- id: color-modify-bg-light
95+
type: class-toggle
96+
title: Modify Background Colors
97+
title.zh: 修改背景颜色
98+
- id: setting-bg-primary-light-hsl
99+
type: variable-color
100+
title: Primary Background Color
101+
title.zh: 主背景色
102+
description: Background color for main area, e.g. editor, setting panel
103+
description.zh: 主要区域的背景色,例如编辑器和设置面板
104+
default: "#"
105+
format: hsl-values
106+
opacity: false
107+
- id: setting-bg-primary-alt-light-hsl
108+
type: variable-color
109+
title: Block Background Color
110+
title.zh: 块背景色
111+
description: Background color for blocks in main area, e.g. codeblock, blockquote
112+
description.zh: 主要区域内的块的背景色,例如代码块、引言块
113+
default: "#"
114+
format: hsl-values
115+
opacity: false
116+
- id: setting-bg-secondary-light-hsl
117+
type: variable-color
118+
title: Secondary Background Color
119+
title.zh: 次背景色
120+
description: Background color in secondary area, e.g. sidebar
121+
description.zh: 次要区域的背景色,例如侧边栏
122+
default: "#"
123+
format: hsl-values
124+
opacity: false
125+
- id: setting-bg-frame-light
126+
type: variable-color
127+
title: Top Bar Background Color
128+
title.zh: 顶栏背景色
129+
description: Background color in the top area, e.g. titlebar, tab container
130+
description.zh: 顶栏的背景色,例如标题栏、标签栏
131+
default: "#"
132+
format: hsl
133+
opacity: false
94134
- id: title-dark-mode
95135
title: Dark Mode
96136
title.zh: 暗色模式
@@ -143,6 +183,46 @@ settings:
143183
default: "#"
144184
format: hsl-split
145185
opacity: false
186+
- id: color-modify-bg-dark
187+
type: class-toggle
188+
title: Modify Background Colors
189+
title.zh: 修改背景颜色
190+
- id: setting-bg-primary-dark-hsl
191+
type: variable-color
192+
title: Primary Background Color
193+
title.zh: 主背景色
194+
description: Background color for main area, e.g. editor, setting panel
195+
description.zh: 主要区域的背景色,例如编辑器和设置面板
196+
default: "#111"
197+
format: hsl-values
198+
opacity: false
199+
- id: setting-bg-primary-alt-dark-hsl
200+
type: variable-color
201+
title: Block Background Color
202+
title.zh: 块背景色
203+
description: Background color for blocks in main area, e.g. codeblock, blockquote
204+
description.zh: 主要区域内的块的背景色,例如代码块、引言块
205+
default: "#111"
206+
format: hsl-values
207+
opacity: false
208+
- id: setting-bg-secondary-dark-hsl
209+
type: variable-color
210+
title: Secondary Background Color
211+
title.zh: 次背景色
212+
description: Background color in secondary area, e.g. sidebar
213+
description.zh: 次要区域的背景色,例如侧边栏
214+
default: "#111"
215+
format: hsl-values
216+
opacity: false
217+
- id: setting-bg-frame-dark
218+
type: variable-color
219+
title: Top Bar Background Color
220+
title.zh: 顶栏背景色
221+
description: Background color in the top area, e.g. titlebar, tab container
222+
description.zh: 顶栏的背景色,例如标题栏、标签栏
223+
default: "#111"
224+
format: hsl
225+
opacity: false
146226
- id: title-layout
147227
title: Layout
148228
title.zh: 布局
@@ -362,7 +442,7 @@ settings:
362442
type: variable-text
363443
title: Setting Panel Header Title
364444
title.zh: 设置面板标题
365-
default: Maple 1.2.5
445+
default: Maple 1.3.0
366446
quotes: true
367447
- id: modal-header-search
368448
type: class-toggle
@@ -2241,6 +2321,22 @@ body {
22412321
--theme-accent-inactive-s: var(--setting-color-inactive-custom-light-s);
22422322
--theme-accent-inactive-l: var(--setting-color-inactive-custom-light-l);
22432323
}
2324+
.theme-light.color-use-custom.color-modify-bg-light {
2325+
--default-mod-bg-hsl: 0, 0%, 93%;
2326+
--background-primary-hsl: var(
2327+
--setting-bg-primary-light-hsl,
2328+
var(--default-mod-bg-hsl)
2329+
);
2330+
--background-primary-alt-hsl: var(
2331+
--setting-bg-primary-alt-light-hsl,
2332+
var(--default-mod-bg-hsl)
2333+
);
2334+
--background-secondary-hsl: var(
2335+
--setting-bg-secondary-light-hsl,
2336+
var(--default-mod-bg-hsl)
2337+
);
2338+
--frame-bg: var(--setting-bg-frame-light, hsl(var(--default-mod-bg-hsl)));
2339+
}
22442340

22452341
.theme-dark {
22462342
--color-red-rgb: 209.304, 137.496, 137.496;
@@ -2327,14 +2423,30 @@ body {
23272423
.theme-dark.color-use-custom.color-active-alt-dark {
23282424
--theme-accent-h: calc(var(--base-accent-h) + 60);
23292425
}
2330-
.theme-dark.color-use-custom.theme-dark.color-use-custom.color-active-custom-dark {
2426+
.theme-dark.color-use-custom.color-active-custom-dark {
23312427
--theme-accent-active-h: var(--setting-color-active-custom-dark-h);
23322428
--theme-accent-active-s: var(--setting-color-active-custom-dark-s);
23332429
--theme-accent-active-l: var(--setting-color-active-custom-dark-l);
23342430
--theme-accent-inactive-h: var(--setting-color-inactive-custom-dark-h);
23352431
--theme-accent-inactive-s: var(--setting-color-inactive-custom-dark-s);
23362432
--theme-accent-inactive-l: var(--setting-color-inactive-custom-dark-l);
23372433
}
2434+
.theme-dark.color-use-custom.color-modify-bg-dark {
2435+
--default-mod-bg-hsl: 0, 0%, 7%;
2436+
--background-primary-hsl: var(
2437+
--setting-bg-primary-dark-hsl,
2438+
var(--default-mod-bg-hsl)
2439+
);
2440+
--background-primary-alt-hsl: var(
2441+
--setting-bg-primary-alt-dark-hsl,
2442+
var(--default-mod-bg-hsl)
2443+
);
2444+
--background-secondary-hsl: var(
2445+
--setting-bg-secondary-dark-hsl,
2446+
var(--default-mod-bg-hsl)
2447+
);
2448+
--frame-bg: var(--setting-bg-frame-dark, hsl(var(--default-mod-bg-hsl)));
2449+
}
23382450

23392451
/* #endregion global variables */
23402452
/* #region style settings */
@@ -2435,31 +2547,42 @@ body.css-settings-manager:not(.color-use-default) .mod-settings .vertical-tab-co
24352547

24362548
/* #endregion */
24372549
/* #region Controls */
2550+
.pcr-app {
2551+
border-radius: var(--radius-m);
2552+
}
2553+
.pcr-app .pcr-interaction input {
2554+
border-radius: var(--radius-s);
2555+
}
2556+
24382557
.style-settings-container .themed-color-wrapper {
24392558
display: flex;
24402559
}
24412560
.style-settings-container .themed-color-wrapper > div {
2561+
background-color: transparent;
24422562
gap: var(--size-4-2);
24432563
}
24442564
.style-settings-container .themed-color-wrapper > div + div {
24452565
margin-top: 0;
24462566
}
2447-
.style-settings-container .themed-color-wrapper > div .pickr > button {
2567+
.style-settings-container .pickr > button {
24482568
width: var(--input-height);
24492569
height: var(--input-height);
24502570
border-radius: var(--button-radius);
2571+
border: 1px solid var(--background-modifier-border);
24512572
}
2452-
.style-settings-container .themed-color-wrapper > div .pickr > button::before, .style-settings-container .themed-color-wrapper > div .pickr > button::after {
2573+
.style-settings-container .pickr > button::before, .style-settings-container .pickr > button::after {
24532574
border-radius: var(--button-radius);
24542575
}
2455-
.style-settings-container .themed-color-wrapper > div .pickr-reset > button {
2576+
.style-settings-container .pickr-reset > button {
24562577
cursor: pointer;
24572578
margin: 0;
24582579
width: var(--input-height);
24592580
height: var(--input-height);
24602581
position: relative;
2582+
background-color: var(--color-base-10);
2583+
color: var(--color-base-70);
24612584
}
2462-
.style-settings-container .themed-color-wrapper > div .pickr-reset > button svg {
2585+
.style-settings-container .pickr-reset > button svg {
24632586
position: absolute;
24642587
top: 50%;
24652588
left: 50%;
@@ -2542,14 +2665,19 @@ body:not(.outline-enable) .setting-item:is([data-id=setting-outline-width],
25422665
[data-id=setting-outline-line-color],
25432666
[data-id=setting-outline-dot-color]),
25442667
body.color-use-default .setting-item:is([data-id=title-light-mode], [data-id=title-dark-mode]),
2545-
body.color-use-minimal .setting-item:is([data-id=setting-accent-h-light],
2546-
[data-id=setting-accent-h-dark],
2547-
[data-id=color-active-light],
2548-
[data-id=color-active-dark]),
2668+
body.color-use-minimal .setting-item:is([data-id=title-light-mode], [data-id=title-dark-mode]),
25492669
body:not(.color-active-custom-light) .setting-item:is([data-id=setting-color-active-custom-light],
25502670
[data-id=setting-color-inactive-custom-light]),
2671+
body:not(.color-modify-bg-light) .setting-item:is([data-id=setting-bg-primary-light-hsl],
2672+
[data-id=setting-bg-primary-alt-light-hsl],
2673+
[data-id=setting-bg-secondary-light-hsl],
2674+
[data-id=setting-bg-frame-light]),
25512675
body:not(.color-active-custom-dark) .setting-item:is([data-id=setting-color-active-custom-dark],
25522676
[data-id=setting-color-inactive-custom-dark]),
2677+
body:not(.color-modify-bg-dark) .setting-item:is([data-id=setting-bg-primary-dark-hsl],
2678+
[data-id=setting-bg-primary-alt-dark-hsl],
2679+
[data-id=setting-bg-secondary-dark-hsl],
2680+
[data-id=setting-bg-frame-dark]),
25532681
body:not(.editor-custom-bottom-spacing) .setting-item[data-id=setting-editor-bottom-spacing],
25542682
body:not(.list-enable) .setting-item:is([data-id*=setting-list-],
25552683
[data-id=list-checkbox],
@@ -2618,14 +2746,19 @@ body:not(.outline-enable) .setting-item:is([data-id=setting-outline-width],
26182746
[data-id=setting-outline-line-color],
26192747
[data-id=setting-outline-dot-color]) + .style-settings-container,
26202748
body.color-use-default .setting-item:is([data-id=title-light-mode], [data-id=title-dark-mode]) + .style-settings-container,
2621-
body.color-use-minimal .setting-item:is([data-id=setting-accent-h-light],
2622-
[data-id=setting-accent-h-dark],
2623-
[data-id=color-active-light],
2624-
[data-id=color-active-dark]) + .style-settings-container,
2749+
body.color-use-minimal .setting-item:is([data-id=title-light-mode], [data-id=title-dark-mode]) + .style-settings-container,
26252750
body:not(.color-active-custom-light) .setting-item:is([data-id=setting-color-active-custom-light],
26262751
[data-id=setting-color-inactive-custom-light]) + .style-settings-container,
2752+
body:not(.color-modify-bg-light) .setting-item:is([data-id=setting-bg-primary-light-hsl],
2753+
[data-id=setting-bg-primary-alt-light-hsl],
2754+
[data-id=setting-bg-secondary-light-hsl],
2755+
[data-id=setting-bg-frame-light]) + .style-settings-container,
26272756
body:not(.color-active-custom-dark) .setting-item:is([data-id=setting-color-active-custom-dark],
26282757
[data-id=setting-color-inactive-custom-dark]) + .style-settings-container,
2758+
body:not(.color-modify-bg-dark) .setting-item:is([data-id=setting-bg-primary-dark-hsl],
2759+
[data-id=setting-bg-primary-alt-dark-hsl],
2760+
[data-id=setting-bg-secondary-dark-hsl],
2761+
[data-id=setting-bg-frame-dark]) + .style-settings-container,
26292762
body:not(.editor-custom-bottom-spacing) .setting-item[data-id=setting-editor-bottom-spacing] + .style-settings-container,
26302763
body:not(.list-enable) .setting-item:is([data-id*=setting-list-],
26312764
[data-id=list-checkbox],
@@ -7187,7 +7320,7 @@ body.modal-header:not(.is-mobile) .modal-container .mod-settings {
71877320
container-type: inline-size;
71887321
}
71897322
body.modal-header:not(.is-mobile) .modal-container .mod-settings::before {
7190-
content: var(--setting-modal-header-title, "Maple 1.2.5");
7323+
content: var(--setting-modal-header-title, "Maple 1.3.0");
71917324
position: absolute;
71927325
left: 50%;
71937326
top: calc(var(--modal-header-height) / 2);

0 commit comments

Comments
 (0)