🔖 v1.4.8

Achuan-2 · Dec 10, 2022 · 4a82774 · 4a82774
1 parent 237b3a9
commit 4a82774
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 28 deletions.
diff --git a/CHANGE_LOGS.md b/CHANGE_LOGS.md
@@ -1,3 +1,11 @@
+## v1.4.8/2022.12.10
+
+- :bug: Green主题导出图片与导出pdf冲突
+- :sparkles: [Ctrl+E高亮修改为不自动隐藏，需要点击隐藏按钮才会隐藏](https://github.com/Achuan-2/siyuan-themes-tsundoku-light/issues/51)
+- :lipstick: [Light 主题页签搜索背景色修正](https://github.com/Achuan-2/siyuan-themes-tsundoku-light/issues/50)
+- :lipstick: [优化标题样式](https://github.com/Achuan-2/siyuan-themes-tsundoku-light/issues/42)
+- :lipstick: [PDF引用与普通引用不容易区分](https://github.com/Achuan-2/siyuan-themes-tsundoku-light/issues/41)
+
 ## v1.4.7/2022.12.08
 
 * :sparkles: [钉住的页签添加pushpin图标](https://github.com/Achuan-2/siyuan-themes-tsundoku-light/issues/49)

diff --git a/README.md b/README.md
@@ -13,12 +13,12 @@
 
 <p align="center">中文介绍 |<a href="README_EN.md"> English</a></p>
 
-<p align="center"><a href="https://github.com/Achuan-2/siyuan-themes-tsundoku-dark"> 🌙Tsunoku Dark </a> |🌞Tsunoku Light | <a href="https://github.com/Achuan-2/siyuan-themes-tsundoku-stone"> 🧱Tsunoku Stone </a>|<a href="https://github.com/Achuan-2/siyuan-themes-tsundoku-green"> 🍃Tsunoku Green </a></p>
+<p align="center"><a href="https://github.com/Achuan-2/siyuan-themes-tsundoku-dark"> 🌙Tsunoku Dark </a> |🌞Tsunoku Light |<a href="https://github.com/Achuan-2/siyuan-themes-tsundoku-green"> 🍃Tsunoku Green </a></p>
 
 ![](preview.png)
 
-> 前排提示：今后会专注于生活工作本身，应该会很少为了添加特性而更新本主题了。 也希望大家是利用工具提升效率，而不只是玩工具耗费时间。  
-> ——Achuan-2于2022.06.09
+> 前排提示：复旦大学脑转化院研究生在读ing，研究生的生活比我想象的忙碌的多得多，现在更新主题很多时候只是为了放松下，所以主题今后只会以完善和修复缺陷适配新版本为主，思源社区目前也出现了很多优秀的主题，也欢迎大家使用其他主题。 
+> ——Achuan-2于2022.12.10 
 
 
 **简介**：[思源笔记(Siyuan)](https://github.com/siyuan-note/siyuan)是一款本地优先的个人知识管理系统，支持完全离线使用，同时也支持端到端加密同步。融合块、大纲和双向链接，构建你永恒的数字花园。本主题为个人原创主题，专为思源笔记设计。
@@ -33,7 +33,7 @@
 🎉系列主题最早诞生于2021.02.22
 
 Tsundoku “積 ん 読”是日语里的一个词，维基百科是这样解释的“Tsundoku is acquiring reading materials but letting them pile up in one's home without reading them. It is also used to refer to books ready for reading later when they are on a bookshelf.” 简单说就是买书成瘾却不读的行为。
-> Any PKM approach that doesn’t tie into execution tools is destined to languish on the back burner forever
+> Any PKM approach that doesn't tie into execution tools is destined to languish on the back burner forever.
 
 使用一个工具的最大障碍是「需求不清」，如果不清楚自己的记录需求是什么，那功能越多，可能造成的障碍越大，很容易就使人陷进去对功能的各种研究中去了。用完一堆笔记软件之后你会明白：最需要提升的并不是你所用的工具，**而是你自己**。
 

diff --git a/theme.css b/theme.css
@@ -206,6 +206,13 @@
     --custom-tab-hover-background: #76878d38;
     --custom-tab-border:#d3dae27c;
     --custom-tab-focus-top-border: #435f6b;
+    /* 各级标题颜色 */
+    --custom-h1-color: #04393f;
+    --custom-h2-color: #0f6379;
+    --custom-h3-color: #15aabf;
+    --custom-h4-color: #2c99a2;
+    --custom-h5-color: #387b86cc;
+    --custom-h6-color: var(--b3-theme-on-background);
 }
 
 .b3-dialog__container {
@@ -280,14 +287,14 @@ body{
     border-bottom: 0px solid #c5c7ca !important;
     font-size: 1.75em !important;
     padding: 0.3em 4px;
-    color: #04393f;
+    color: var(--custom-h1-color);
 }
 
 .protyle-wysiwyg [data-node-id].h2,.b3-typography h2 {
     border-bottom: 1px solid #dfe0e1 !important;
     /* border-bottom: 0px solid transparent !important; */
     font-size: 1.55em !important;
-    color: #34495e;
+    color: var(--custom-h2-color);
     border-radius: 0px;
 
 }
@@ -298,7 +305,7 @@ body{
 .protyle-wysiwyg [data-node-id].h3,
 .b3-typography h3{
     font-size: 1.35em !important;
-    color: rgb(21, 170, 191);
+    color: var(--custom-h3-color);
 
 }
 .protyle-wysiwyg [data-node-id].h3>div:first-child::before,
@@ -311,7 +318,7 @@ body{
     font-size: 1.35em !important;
     margin-right: 8px;
     margin-top: -0.10em;
-    background: rgb(21, 170, 191);
+    background: var(--custom-h3-color);
 }
 
 
@@ -354,15 +361,15 @@ body{
 } */
 .protyle-wysiwyg [data-node-id].h4,.b3-typography h4 {
     font-size: 1.2em !important;
-    color: #03a1b9cc;
+    color: var(--custom-h4-color);
 }
 .protyle-wysiwyg [data-node-id].h5,.b3-typography h5 {
     font-size: 1.1em!important;
-    color: #58c6d6;
+    color: var(--custom-h5-color);
 }
 .protyle-wysiwyg [data-node-id].h6,.b3-typography h6 {
     font-size: 1.1em!important;
-    /* color: #03a1b9cc; */
+    color: var(--custom-h6-color);
 }
 /* 标题加粗样式 */
 
@@ -1476,10 +1483,9 @@ div[data-subtype='t'][data-type='NodeList'] {
     border-bottom: 1px dashed #308b84;
 
 }
-.protyle-wysiwyg [data-node-id] span[data-type='file-annotation-ref']::before {
-    /* 隐藏默认主题加的🔖，原因：我觉得很多余 */
+/* .protyle-wysiwyg [data-node-id] span[data-type='file-annotation-ref']::before {
     display: none;
-}
+} */
 .protyle-wysiwyg [data-node-id] span[data-type='file-annotation-ref']:hover {
     color: var(--b3-protyle-inline-blockref-hover-color); /*更改鼠标悬浮的颜色*/
     border-bottom: 1px dashed var(--b3-protyle-inline-blockref-hover-color); /*下划线可以去掉*/
@@ -1574,32 +1580,33 @@ div[data-subtype='t'][data-type='NodeList'] {
 .file-tree ul.b3-list.b3-list--background [data-subtype="h1"]{
     font-weight: 600;
     opacity: 1;
-    color:#04393f !important;
+    color:var(--custom-h1-color) !important;
 }
 .file-tree ul.b3-list.b3-list--background [data-subtype="h2"] .b3-list-item__text,
 .file-tree ul.b3-list.b3-list--background [data-subtype="h2"]{
     opacity: 1;
     font-weight: 600;
-    color:#34495e;
+    color:var(--custom-h2-color) !important;
 }
 .file-tree ul.b3-list.b3-list--background [data-subtype="h3"] .b3-list-item__text,
 .file-tree ul.b3-list.b3-list--background [data-subtype="h3"]{
     /* opacity: 1; */
     font-weight: 600;
-    color:#15aabf !important;
+    color:var(--custom-h3-color) !important;
 }
 .file-tree ul.b3-list.b3-list--background [data-subtype="h4"] .b3-list-item__text,
 .file-tree ul.b3-list.b3-list--background [data-subtype="h4"]{
-    color:#34b3c6;
+    color:var(--custom-h4-color);
 }
 .file-tree ul.b3-list.b3-list--background [data-subtype="h5"] .b3-list-item__text,
 .file-tree ul.b3-list.b3-list--background [data-subtype="h5"]{
     opacity: 1;
-    color:#58c6d6;
+    color:var(--custom-h5-color);
 }
 .file-tree ul.b3-list.b3-list--background [data-subtype="h6"] .b3-list-item__text,
 .file-tree ul.b3-list.b3-list--background [data-subtype="h6"]{
     opacity: 1;
+    color: var(--custom-h6-color);
 }
 .file-tree .b3-list--background .b3-list-item .b3-list-item__text:hover {
     color: var(--b3-menu-highlight-color) !important;
@@ -1915,4 +1922,9 @@ body>div#action{
     width: 13px;
     font-size: 0.7em;
     opacity: 0.7;
+}
+
+/* 修复页签搜索的背景颜色 */
+.search__list{
+    background-color: #f1f5f8;
 }
diff --git a/theme.js b/theme.js
@@ -263,17 +263,14 @@ function openRightPanel() {
 /**------------------高亮变隐藏按钮-----------------*/
 
 function createHighlightBecomesHidden() {
-	loadStyle("/appearance/themes/Tsundoku Light/style/mark-hide.css", "markCss");
+	loadStyle("/appearance/themes/Tsundoku Light/style/mark-display.css", "markCss");
 
 	highlightBecomesHiddenButton = addinsertCreateElement(
 		HBuiderXToolbar,
 		"div",
 		HighlightBecomesHiddenID
 	);
-	highlightBecomesHiddenButton.setAttribute(
-		"title",
-		"开启后显示CTRL+E隐藏文本。"
-	);
+	highlightBecomesHiddenButton.setAttribute('title', '开启后隐藏CTRL+E文本');
 
 	AddEvent(
 		highlightBecomesHiddenButton,
@@ -288,19 +285,19 @@ function highlightBecomesHiddenButtonClickEven() {
 
 	if (
 		obj.getAttribute("href") !=
-		"/appearance/themes/Tsundoku Light/style/mark-hide.css"
+		"/appearance/themes/Tsundoku Light/style/mark-display.css"
 	) {
 		obj.setAttribute(
 			"href",
-			"/appearance/themes/Tsundoku Light/style/mark-hide.css"
+			"/appearance/themes/Tsundoku Light/style/mark-display.css"
 		);
 		highlightBecomesHiddenButton.style.backgroundColor = "transparent";
 		highlightBecomesHiddenButton.style.backgroundImage =
 			"url(/appearance/themes/Tsundoku Light/src/highlight.svg)";
 	} else {
 		obj.setAttribute(
 			"href",
-			"/appearance/themes/Tsundoku Light/style/mark-display.css"
+			"/appearance/themes/Tsundoku Light/style/mark-hide.css"
 		);
 		highlightBecomesHiddenButton.style.backgroundColor =
 			"var(--b3-theme-background-light)";

diff --git a/theme.json b/theme.json
@@ -2,7 +2,7 @@
   "name": "Tsundoku Light",
   "author": "Achuan-2",
   "url": "https://github.com/Achuan-2/siyuan-themes-tsundoku-light",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "modes": [
     "light"
   ]