Skip to content

Commit 1529a71

Browse files
author
Chlorine
committed
投吸式更新!
1 parent 665298d commit 1529a71

File tree

107 files changed

+797
-29
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+797
-29
lines changed

.DS_Store

6 KB
Binary file not shown.

README.en.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<div align="center">
55
</div>
66

7-
87
## Introduction
98

109
I've always been a fan of Typora's [Lapis theme](https://github.com/YiNNx/typora-theme-lapis). So, after I decided to modify the Lapis CSS file to use my favorite font, LxgwWenKai, I decided to create a new theme.
@@ -49,9 +48,9 @@ The theme is open source on both [Github](https://github.com/yoghurtlee-thu/typo
4948

5049
## Contribution
5150

52-
This theme was initially for personal use, and the style was adjusted based on my personal preferences. It was written entirely on Windows 11 23H2 and has not been tested on other systems, so there may be unknown style issues on MacOS and Linux.
51+
This theme was initially for personal use, and the style was adjusted based on my personal preferences. The initial development of this theme was based on Windows 11 23H2, and subsequent maintenance was based on macOS Sonoma. so there may be unknown style issues on other systems.
5352

54-
Raising Issues/Pull Requests on Github/Gitee is always welcomed. You can also reach me via email at [chlorine3545@163.com](vscode-file://vscode-app/d:/%E7%A8%8B%E5%BA%8F/Microsoft%20VS%20Code/resources/app/out/vs/code/electron-sandbox/workbench/workbench.html "mailto:&amp;#x63;&amp;#x68;&amp;#108;&amp;#x6f;&amp;#114;&amp;#x69;&amp;#110;&amp;#x65;&amp;#x33;&amp;#x35;&amp;#52;&amp;#x35;&amp;#64;&amp;#49;&amp;#54;&amp;#x33;&amp;#x2e;&amp;#99;&amp;#x6f;&amp;#x6d;"). Thank you for your valuable opinions and suggestions.
53+
Raising Issues/Pull Requests on Github/Gitee is always welcomed. You can also reach me via email at [yoghurtlee123@gmail.com](mailto:yoghurtlee123@gmail.com). Thank you for your valuable opinions and suggestions.
5554

5655
## Acknowledgements
5756

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ Marble 主题采用自然柔和的主题配色。背景颜色为大理石色,
5050

5151
## 贡献
5252

53-
本主题最初仅供个人使用,主题样式基于作者个人的喜好进行调整;同时本主题完全基于 Windows 11 23H2 系统编写,未在其他系统进行测试,因此在 MacOS 和 Linux 上可能存在未知的样式问题
53+
本主题最初仅供个人使用,主题样式基于作者个人的喜好进行调整;同时本主题的最初开发基于 Windows 11 23H2 系统,后续维护基于 macOS Sonoma 系统,在其他系统上可能存在未知的样式问题
5454

5555
由于作者暂时没有主题维护能力,因此对于出现的问题仅能保证尽力修复。若有社区大佬愿意出手相助,不胜感激(合十)。
5656

57-
欢迎您在 Github/Gitee 提出 Issue/Pull Request。您也可以通过邮件chlorine3545@163.com联系我,感谢您宝贵的意见和建议。
57+
欢迎您在 Github/Gitee 提出 Issue/Pull Request。您也可以通过邮件 [yoghurtlee123@gmail.com](mailto:yoghurtlee123@gmail.com) 联系我,感谢您宝贵的意见和建议。
5858

5959
## 致谢
6060

61-
- 样式代码基于[YiNNx](https://github.com/YiNNx)[Lapis主题](https://github.com/YiNNx/typora-theme-lapis)
61+
- 样式代码基于 [YiNNx](https://github.com/YiNNx)[Lapis主题](https://github.com/YiNNx/typora-theme-lapis)
6262
- 中文字体采用好看的开源字体[霞鹜文楷 LXGW](https://github.com/lxgw/LxgwWenKai)
6363
- 感谢 ChatGPT 和 Github Copilot 的鼎力相助(逃
6464

6565
## 许可
6666

67-
Marble 主题在 MIT License 下开源。[这里](https://github.com/YiNNx/typora-theme-lapis/blob/main/License)是原主题 Lapis 的 MIT License 地址。
67+
Marble 主题在 MIT License 下开源。[这里](https://github.com/YiNNx/typora-theme-lapis/blob/main/License) 是原主题 Lapis 的 MIT License 地址。

marble.css

+15-22
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
/*Typora Theme: Marble | https://github.com/yoghurtlee-thu/typora-theme-marble https://gitee.com/yoghurtlee-thu/typora-theme-marble */
44

5+
@import url('marble/LXGWWenKaiGBScreen/font.css');
6+
57
:root {
68
--text-color: #2b353af5;
79
/* 文本颜色 Text */
810
--primary-color: #000000;
911
/* 基础颜色 Primary Color */
10-
--bg-color: #f8f8f8db;
12+
--bg-color: #ffffff;
1113
--side-bar-bg-color: var(--bg-color);
1214
/* 背景色 Background */
1315

@@ -41,8 +43,8 @@
4143
}
4244

4345
/*
44-
* 字体采用 Cantarell, 霞鹜文楷 GB 和 JetBrains Mono
45-
* Font-face for Cantarell, LXGWWenKai GB and JetBrains Mono
46+
* 字体采用 Cantarell, 霞鹜文楷 GB Screen 和 JetBrains Mono
47+
* Font-face for Cantarell, LXGWWenKai GB Screen and JetBrains Mono
4648
*/
4749

4850
@font-face {
@@ -55,17 +57,6 @@
5557
src: url('marble/JetBrainsMono-Regular.ttf');
5658
}
5759

58-
@font-face {
59-
font-family: "LXGWWenKaiGB";
60-
src: url('marble/LXGWWenKaiGB-Regular.ttf');
61-
}
62-
63-
@font-face {
64-
font-family: "LXGWWenKaiGB";
65-
src: url('marble/LXGWWenKaiGB-Bold.ttf');
66-
font-weight: bold;
67-
}
68-
6960
/* 基础样式 Basic Style */
7061

7162
#write {
@@ -79,7 +70,7 @@
7970
word-wrap: break-word;
8071
text-align: justify;
8172

82-
font-family: 'Cantarell', 'LXGWWenKaiGB', 'JetBrainsMono';
73+
font-family: 'Cantarell', 'LXGWWenKaiGBScreen', 'JetBrainsMono';
8374
margin-bottom: 20rem;
8475
}
8576

@@ -101,13 +92,15 @@
10192

10293
#write strong {
10394
color: var(--primary-color);
104-
text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.1);
95+
font-weight: 575;
10596
}
10697

10798
/* 链接 Link */
10899

109-
#write a {
100+
#write strong {
110101
color: var(--primary-color);
102+
font-weight: 575;
103+
text-shadow: 0.4px 0.4px 0.8px rgba(0, 0, 0, 0.2);
111104
}
112105

113106
#write .md-p a,
@@ -138,15 +131,15 @@
138131
/* 目录 TOC */
139132

140133
.md-toc-content {
141-
font-family: 'Cantarell', 'LXGWWenKaiGB';
134+
font-family: 'Cantarell', 'LXGWWenKaiGBScreen';
142135
}
143136

144137
.md-toc-content:empty:before {
145138
color: var(--primary-color);
146139
}
147140

148141
#write div.md-toc-tooltip {
149-
font-family: 'Cantarell', 'LXGWWenKaiGB';
142+
font-family: 'Cantarell', 'LXGWWenKaiGBScreen';
150143
color: var(--primary-color);
151144
position: static;
152145
margin-top: 10px;
@@ -207,7 +200,7 @@ mark {
207200
#write h4,
208201
#write h5,
209202
#write h6 {
210-
font-family: 'Cantarell', 'LXGWWenKaiGB';
203+
font-family: 'Cantarell', 'LXGWWenKaiGBScreen';
211204
padding: 0px;
212205
color: var(--primary-color);
213206
}
@@ -448,7 +441,7 @@ li.md-list-item {
448441
}
449442

450443
#write table tr th {
451-
font-family: LXGWWenKaiGB;
444+
font-family: LXGWWenKaiGBScreen;
452445
text-align: center;
453446
min-width: 10rem;
454447
font-weight: bold;
@@ -564,7 +557,7 @@ blockquote .task-list-item input::before {
564557
* Sidebar
565558
*/
566559
#typora-sidebar {
567-
font-family: 'Cantarell', 'LXGWWenKaiGB';
560+
font-family: 'Cantarell', 'LXGWWenKaiGBScreen';
568561
height: 100%;
569562
color: var(--text-color);
570563
font-size: 0.92rem;

marble/.DS_Store

6 KB
Binary file not shown.

marble/LXGWWenKaiGB-Bold.ttf

-8.54 MB
Binary file not shown.

marble/LXGWWenKaiGB-Light.ttf

-9.02 MB
Binary file not shown.

marble/LXGWWenKaiGB-Regular.ttf

-8.62 MB
Binary file not shown.

marble/LXGWWenKaiGBScreen/.DS_Store

8 KB
Binary file not shown.

0 commit comments

Comments
 (0)