From add08238cb50268ab8c8a775fe1a17960241122b Mon Sep 17 00:00:00 2001 From: Tron Date: Tue, 30 Apr 2024 23:21:07 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96=20v2.0.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 15 +++ README_zh_CN.md | 31 +++--- style/editor.css | 101 ++++++++------------ style/export.css | 159 +++++++++++++++++++++++++++++-- style/module/code_block.css | 21 +++- style/module/code_block_dark.css | 112 +--------------------- style/theme/Tsundoku_dark.css | 47 ++------- style/theme/Tsundoku_green.css | 16 +++- theme.css | 80 ++++++++-------- theme.json | 2 +- 10 files changed, 299 insertions(+), 285 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7da3cf6..7d94010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +## v2.0.6 / 2024.04.30 +- ✨ 思源笔记预览模式直接复制到微信公众号适配 +- 🔥 取消link icon,需要的可用集市的[链接图标]插件 +- 💄 超链接样式调整 +- 💄 备注样式调整,取消背景色,变为橙色下划线 +- 💄 适配思源v3.0.12的图标样式 +- 💄 代码块样式修改 + - 调整代码行号宽度 + - 调整代码语言位置 + - 调整代码内容与左侧的间隔 +- 💄 标题样式修改 + - h3 标题样式:左边添加竖线 + - h1 标题样式:居中加下划线 +- 💄优化导出pdf的超链接下划线样式 + ## v2.0.5 / 2024.04.26 - 💄 高亮样式优化,参考Asri主题 diff --git a/README_zh_CN.md b/README_zh_CN.md index 38cf1c2..4a67e17 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -30,24 +30,21 @@ ## 🚀最近更新 -v2.0.5 / 2024.04.26 -- 💄 高亮样式优化,参考Asri主题 - - v2.0.4 / 2024.04.22 -- 💄 优化块右上角所属数据库的样式:添加padding -- 💄 修改标题颜色 -- 💄 blockquote样式修改,参考Github样式 - - -v2.0.3 / 2024.04.16 -- 🐛 修复Dark主题link icon 失效 -- 💄 块右上方的数据库角标样式优化:模仿标签样式,添加背景颜色和文字颜色,隐藏数据库图标 -- 🐛 Dark主题行内代码每个文字被间隔开 - - v2.0.2 / 2024.04.15 -- 🔥 取消表格默认居中 -- 🔥 取消集市样式调整 +v2.0.6 / 2024.04.30 +- ✨ 思源笔记预览模式直接复制到微信公众号适配 +- 🔥 取消link icon,需要的可用集市的[链接图标]插件 +- 💄 超链接样式调整 +- 💄 备注样式调整,取消背景色,变为橙色下划线 +- 💄 适配思源v3.0.12的图标样式 +- 💄 代码块样式修改 + - 调整代码行号宽度 + - 调整代码语言位置 + - 调整代码内容与左侧的间隔 - 💄 标题样式修改 + - h3 标题样式:左边添加竖线 + - h1 标题样式:居中加下划线 +- 💄优化导出pdf的超链接下划线样式 + 全部更新日志请见 [CHANGELOG](./CHANGELOG.md) diff --git a/style/editor.css b/style/editor.css index 9cf4057..2d24a2e 100644 --- a/style/editor.css +++ b/style/editor.css @@ -40,6 +40,9 @@ font-size: 1.75em !important; padding: 0.3em 4px; color: var(--custom-h1-color); + border-bottom: 2px solid var(--custom-h1-color); + border-radius: 0px !important; + margin-bottom: 1.5em; } /* 列表中的一级标题不居中 */ @@ -65,56 +68,32 @@ } /* 3. 三级标题样式setup */ - -.protyle-wysiwyg [data-node-id].h3, -.b3-typography h3 { - /* ⚙三级标题基本样式 */ - font-size: 1.35em !important; +.protyle-wysiwyg [data-node-id].h3, .b3-typography h3{ + font-size: 1.35em; color: var(--custom-h3-color); - /* color: var(--b3-card-info-color); */ - /* background-color: #d1ecf7; */ - /* box-shadow: 2px 2px 2px var(--b3-table-border-color); */ + text-align: left; + font-weight: bold; + padding-left: 8px; + border-left: 5px solid var(--custom-h3-color); + border-radius: 0px !important; + /* 控制竖线高度 */ + line-height: 1.25; + height: 1.25 em; } -/* 三级标题前面添加竖线*/ -/* .protyle-wysiwyg:not([custom-title-num='true']) [data-node-id].h3 > div:first-child::before, -.b3-typography h3:before { - content: ''; - display: block; - float: left; - height: 0.75em; - width: 0.125em; - font-size: 1.35em !important; - margin-right: 8px; - margin-top: 0.07em; - background: var(--custom-h3-color); -} */ - -/* 调整h3空行时光标位置 */ -/* .protyle-wysiwyg .h3 > [spellcheck='false']:empty { - padding-left: 1rem; +.protyle-wysiwyg .h3 > [spellcheck='false']:empty { + /* empty的高度需要等于line-height */ + height: 1.25em; +} +/* 列表下适配 */ +.protyle-wysiwyg [data-node-id].li > .protyle-action ~ .h3{ + line-height: 1.5 !important; + height: 1.5em !important; +} +.protyle-wysiwyg .li > .h3 > [spellcheck='false']:empty { + /* empty的高度需要等于line-height */ + height: 1.5em; } -.protyle-wysiwyg .h3 > [spellcheck='false']:empty:before { - content: ''; - display: block; - height: 0.15em; - margin-top: -0.3em; - margin-left: -1rem; -} */ - -/* 列表中h3特殊调整 */ -/* .protyle-wysiwyg .li > .h3 > div:first-child:before { - margin-top: 0.27em !important; -} */ -/* 列表下三级标题竖线不显示 */ -/* .protyle-wysiwyg .li > [data-node-id].h3 > div:first-child::before, -.b3-typography h3:before { - display: none !important; -} */ -/* 调整h3空行时光标位置 */ -/* .protyle-wysiwyg .li > .h3 > [spellcheck='false']:empty { - padding-left: 0rem !important; -} */ /* 4. 四级标题样式setup */ .protyle-wysiwyg [data-node-id].h4, @@ -227,14 +206,13 @@ .protyle-wysiwyg [data-node-id].bq:not([style*='background-color']) { /* border: 1px solid var(--custom-blockquote-border-color); */ padding: 2px 4px; - border-left: 0.3em solid #d0d7de; - border-radius: 0px 7px 7px 0px !important; + border-left: 0em solid #4c6778; + background-color: #73a8c70f; + border: 1px solid var(--custom-blockquote-border-color); + border-radius: 7px !important; color: #6a6969; - background-color: transparent; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; } + .protyle-wysiwyg [data-node-id].bq[style*='background-color'] { border: 1px solid var(--custom-blockquote-border-color) !important; border-radius: 7px !important; @@ -628,14 +606,16 @@ li[data-type='navigation-file'] .counter { .b3-typography span[data-type~='code'], .protyle-wysiwyg code:not(.hljs), .protyle-wysiwyg span[data-type~='code'] { - /* margin: 0px 2px 0px; */ + margin: 0px 2px 0px; top: -0.1em; color: var(--b3-protyle-inline-code-color); font-size: 80%; word-break: break-all; background-color: var(--b3-protyle-inline-code-background); } - +#preview .protyle-wysiwyg span[data-type~='code'] { + margin: 0px; +} /* 调整kbd标签 */ .b3-typography kbd, .protyle-wysiwyg kbd, @@ -665,7 +645,10 @@ li[data-type='navigation-file'] .counter { .protyle-wysiwyg [data-node-id] span[data-type~='a']:hover { color: var(--b3-protyle-inline-link-hover-color); - border-bottom: 1px solid var(--b3-protyle-inline-link-hover-color); + border-bottom: 2px solid var(--b3-protyle-inline-link-hover-color); +} +[data-theme-mode="light"] .protyle-wysiwyg [data-node-id] span[data-type~='a']:hover { + background-color: #f1f9ff; } .protyle-wysiwyg [data-node-id] span[data-type~='a']:hover code { color: var(--b3-protyle-inline-link-hover-color); @@ -686,13 +669,13 @@ li[data-type='navigation-file'] .counter { /* ------------------------------设置备注样式 ------------------------------ */ .b3-typography span[data-type~='inline-memo'], .protyle-wysiwyg span[data-type~='inline-memo'] { - background-color: #fffccf; - border-bottom: 2px solid #fff001; + background-color: transparent; + border-bottom: 3px solid var(--b3-font-color1); } .tooltip--memo { - border-top: 3px solid #fff001; - background-color: #fffccf; + border-top: 3px solid #eec175; + background-color: #ffedcf; padding: 1rem 1rem; font-size: 1rem; color: var(--b3-theme-on-background); diff --git a/style/export.css b/style/export.css index 0ea0afb..e08dd76 100644 --- a/style/export.css +++ b/style/export.css @@ -1,7 +1,119 @@ -#preview .h1 { - text-align: center !important; + + +/* ---------------------------------------导出微信文章和pdf样式-----------------------------------*/ +/* 导出微信文章设置默认字体 */ +.protyle-preview>.b3-typography { + font-size: 14px !important; +} + + +[data-theme-mode="light"] .protyle-preview>.b3-typography h1, +#preview .protyle-wysiwyg .h1{ + font-weight: bold; + border-bottom: 2px solid rgba(15, 76, 129, 1); + text-align: center; + color: rgba(15, 76, 129, 1); + +} +.protyle-preview>.b3-typography h1{ + font-size: 24px !important; +} +[data-theme-mode="dark"] .protyle-preview>.b3-typography h2{ + display: table; + text-align: center; + margin: 40px auto 40px; +} +[data-theme-mode="light"] .protyle-preview>.b3-typography h2, +#preview .protyle-wysiwyg .h2 { + display: table; + text-align: center; + border-bottom: 1px solid #dfe0e1 !important; + color: #083256; + border-radius: 0px; + line-height: 1.75; + margin: 40px auto 40px; +} +[data-theme-mode="light"] .protyle-preview>.b3-typography h2{ + font-size: 20px !important; + } +[data-theme-mode="light"] .protyle-preview>.b3-typography h3, +#preview .protyle-wysiwyg .h3 { + + text-align: left; + font-weight: bold; + margin: 1em 8px 0.75em 0; + padding-left: 8px; + border-left: 4px solid rgba(15, 76, 129, 1); + color: rgba(15, 76, 129, 1) !important; + border-radius: 0px !important; +} +[data-theme-mode="light"] .protyle-preview>.b3-typography h3{ + font-size: 16px !important; +} + +[data-theme-mode="light"] .protyle-preview .b3-typography h4, +#preview .protyle-wysiwyg .h4 { + font-weight: bold; + color: #1c849e; +} +[data-theme-mode="light"] .protyle-preview .b3-typography h4{ + font-size: 15px !important; +} +[data-theme-mode="light"] .protyle-preview>.b3-typography h5, +#preview .protyle-wysiwyg .h5 { + font-weight: bold; + color: rgba(15, 76, 129, 1); +} +[data-theme-mode="light"] .protyle-preview>.b3-typography h5{ + font-size: 14px !important; +} +[data-theme-mode="light"] .protyle-preview>.b3-typography h6, +#preview .protyle-wysiwyg .h6{ + font-size: 14px !important; + font-weight: bold; +} +[data-theme-mode="light"] .protyle-preview>.b3-typography h6{ + font-size: 14px !important; +} +/* 图片居中 */ +#preview .protyle-wysiwyg .p:has(span.img), +[data-theme-mode="light"] .protyle-preview>.b3-typography p:has(span.img:only-child) { +text-align:center; +} +/* 超链接 */ +[data-theme-mode="light"] .protyle-preview>.b3-typography a { + color: #338dd6; + /* text-decoration: underline; */ + +} +/* 行内代码 */ +[data-theme-mode="light"] .protyle-preview>.b3-typography span[data-type~='code']{ + color:#3779b3; + background-color:#f3f4f4; +} +/* 代码块 */ +[data-theme-mode="light"] .protyle-preview>.b3-typography .hljs { + background-color: #f8f9fa; +} +/* 表格框线 */ +[data-theme-mode="light"] .protyle-preview>.b3-typography table tr th, +[data-theme-mode="light"] .protyle-preview>.b3-typography table tr td{ + border-color: #d1d3d6; +} + +/* 引述块 */ +[data-theme-mode="light"] .protyle-preview>.b3-typography blockquote, +#preview.protyle-wysiwyg blockquote{ + border-left: 0em solid #4c6778; + background-color: #73a8c70f; + border: 1px solid rgb(224 239 249); + border-radius: 7px !important; +} + +/* ---------------------------------------导出pdf-----------------------------------*/ + /* 设置导出样式 */ @media print { @@ -9,11 +121,46 @@ font-family: var(--b3-font-family); } } -/* 导出的链接样式 */ -#preview a { - color: var(--b3-protyle-inline-link-color); -} + +/* 导出pdf设置默认字体 */ +#preview .protyle-wysiwyg{ + font-size: 17px !important; +} +/* 去除导出pdf的列表竖线 */ #preview .protyle-wysiwyg [data-node-id].li:before { border-left: 0.5px solid transparent; } +/* pdf的a标签 */ +#preview .protyle-wysiwyg a { + color: var(--b3-protyle-inline-link-color); + text-decoration: none; + border-bottom: 1px solid var(--custom-link-bottom-color); +} +/* 代码块 */ +#preview .protyle-wysiwyg .code-block { + padding: 0; + background: var(--b3-protyle-code-background); + border-radius: 4px; + box-shadow: none; +} + +/* ---------------------------------------导出图片-----------------------------------*/ +/* 行内代码优化 */ +.export-img .protyle-wysiwyg span[data-type~='code']{ + margin-left: 0px; + margin-right: 0px; +} +.export-img .protyle-wysiwyg span[data-type~='code']:first-child{ + margin-left: 0.4em; +} +.export-img .protyle-wysiwyg span[data-type~='code']:last-child{ + + margin-right: 0.4em; +} +/* 超链接样式 */ +.export-img .protyle-wysiwyg a { + color: var(--b3-protyle-inline-link-color); + text-decoration: none; + border-bottom: 1px solid var(--custom-link-bottom-color); +} \ No newline at end of file diff --git a/style/module/code_block.css b/style/module/code_block.css index 2c66d14..3845b86 100644 --- a/style/module/code_block.css +++ b/style/module/code_block.css @@ -2,21 +2,33 @@ --custom-code-background: #a3acb0; --custom-code-hover: #5f7b8c; } +/* 代码块最大高度 */ +/* .b3-typography .hljs, */ +.protyle-wysiwyg .hljs { + max-height: 800px; + overflow: auto; +} +#preview .protyle-wysiwyg .hljs { + max-height: none; +} /* 代码块 */ .protyle-wysiwyg .code-block[fold='1'] .hljs { opacity: 0; } -.b3-typography .code-block, +/* .b3-typography .code-block, */ .protyle-wysiwyg .code-block { padding: 0; background: var(--b3-protyle-code-background); border-radius: 4px; box-shadow: 0 0 0 1px #1e25351a; } -.b3-typography .hljs, +/* .b3-typography .hljs, */ .protyle-wysiwyg .hljs { background-color: var(--b3-protyle-code-background) !important; - padding: 34px 16px 22px 32px; + padding: 34px 15px 15px 15px; +} +.b3-typography .hljs{ + padding: 15px 15px 15px 15px; } /* 代码行数 */ .b3-typography .hljs.protyle-linenumber, @@ -27,7 +39,6 @@ .b3-typography .protyle-linenumber__rows, .protyle-wysiwyg .protyle-linenumber__rows { padding: 34px 0 22px; - width: 74px; opacity: 0.7; background-color: var(--b3-protyle-code-background); } @@ -53,7 +64,7 @@ text-transform: uppercase; border-radius: 4px; padding: 0 5px; - margin: 4px 0 0 26px !important; + margin-left:0.5em; font-size: 12px !important; } .protyle-wysiwyg .code-block .protyle-action__language:hover { diff --git a/style/module/code_block_dark.css b/style/module/code_block_dark.css index cd30513..b68f141 100644 --- a/style/module/code_block_dark.css +++ b/style/module/code_block_dark.css @@ -3,124 +3,14 @@ --custom-code-hover: #5f7b8c; --custon-code-language-color: #7e888d; } -/* 代码块 */ -.protyle-wysiwyg .code-block[fold='1'] .hljs { - opacity: 0; -} + .b3-typography .code-block, .protyle-wysiwyg .code-block { - padding: 0; - background: var(--b3-protyle-code-background); - border-radius: 4px; box-shadow: 0 0 0 2px #050b19f0; } -.b3-typography .hljs, -.protyle-wysiwyg .hljs { - background-color: var(--b3-protyle-code-background) !important; - padding: 34px 16px 22px 32px; -} -/* 代码行数 */ -.b3-typography .hljs.protyle-linenumber, -.protyle-wysiwyg .hljs.protyle-linenumber { - padding-left: 0; - /* margin-left: 74px; */ -} -.b3-typography .protyle-linenumber__rows, -.protyle-wysiwyg .protyle-linenumber__rows { - padding: 34px 0 22px; - width: 74px; - opacity: 0.7; - background-color: var(--b3-protyle-code-background); -} -.b3-typography .protyle-linenumber__rows span::before, -.protyle-wysiwyg .protyle-linenumber__rows span::before { - text-align: center; - justify-content: center; - align-items: center; -} -/* 代码语言选择框 */ -.protyle-wysiwyg .code-block .protyle-action .protyle-action__language { - /* 代码语言默认显示 */ - opacity: 1; -} - .protyle-wysiwyg .code-block .protyle-action__language { - background-color: transparent; color: var(--custon-code-language-color); - transition: all 0.2s cubic-bezier(0.645, 0.045, 0.355, 1); - height: 20px; - line-height: 20px; - vertical-align: middle; - display: inline-flex; - text-transform: uppercase; - border-radius: 4px; - padding: 0 5px; - margin: 4px 0 0 26px !important; - font-size: 12px !important; -} -.protyle-wysiwyg .code-block .protyle-action__language:hover { - background-color: var(--custom-code-background); -} -.protyle-wysiwyg .code-block .protyle-action__language:active { - background-color: var(--custom-code-background); } -/* 代码复制按钮和菜单 */ -/* .protyle-wysiwyg .code-block .protyle-action__copy { - display: inline-flex; - width: auto; -} -.protyle-wysiwyg .code-block .protyle-action__copy svg { - margin: 0; - width: 11px; - height: 11px; - padding: 0px 0px; - margin: auto 0; - margin-right: 6px; -} -.protyle-wysiwyg .code-block .protyle-action__copy::after { - opacity: 1; - transform: unset; - margin: 0; - padding: 0; - border: unset; - border-radius: unset; - box-shadow: unset; - outline: unset; - position: unset; - height: 25px; - line-height: 25px; - vertical-align: middle; - display: inline-flex; - font-size: 11px; - position: unset; - z-index: 0; -} -.protyle-wysiwyg .code-block .protyle-action__copy::after { - content: 'Copy'; -} */ -.protyle-wysiwyg .code-block .protyle-action__copy, -.protyle-wysiwyg .code-block .protyle-action__menu { - background-color: var(--custom-code-background); - transition: all 0.2s cubic-bezier(0.645, 0.045, 0.355, 1); -} -.protyle-wysiwyg .code-block .protyle-action__copy:hover, -.protyle-wysiwyg .code-block .protyle-action__menu:hover { - background-color: var(--custom-code-hover); -} -.protyle-wysiwyg .code-block .protyle-action__copy:active, -.protyle-wysiwyg .code-block .protyle-action__menu:active { - background-color: var(--custom-code-hover); -} -.protyle-wysiwyg .code-block:hover.protyle-action__language { - opacity: 1; -} -.protyle-wysiwyg .code-block[fold='1'] { - height: 36px !important; -} -.protyle-wysiwyg .code-block[fold='1'] .protyle-icon { - margin-top: 1.5px !important; -} - diff --git a/style/theme/Tsundoku_dark.css b/style/theme/Tsundoku_dark.css index 04a7ca8..9b39983 100644 --- a/style/theme/Tsundoku_dark.css +++ b/style/theme/Tsundoku_dark.css @@ -64,18 +64,18 @@ --b3-font-color6: #6cf9ee; --b3-font-color7: var(--b3-theme-secondary); --b3-font-color8: #f5822e; - --b3-font-color9: #0d0d0f; + --b3-font-color9: #9f9ff8; --b3-font-color10: #ca98ff; --b3-font-color11: #d90ec5; --b3-font-color12: #eb5042; --b3-font-color13: var(--b3-theme-background); --b3-font-background1: #ff8f8999; - --b3-font-background2: #e5aa57c0; + --b3-font-background2: #e5aa5752; --b3-font-background3: rgba(54, 171, 248, 0.521); --b3-font-background4: #8fe7b277; --b3-font-background5: #6f8ca38f; --b3-font-background6: #09a1b873; - --b3-font-background7: #f3a82fbd; + --b3-font-background7: #f3a82f63; --b3-font-background8: #a35b28ce; --b3-font-background9: #324272; --b3-font-background10: #a979d683; @@ -143,7 +143,7 @@ --b3-protyle-inline-s-color: #c9d1d991; --b3-protyle-inline-link-color: #57a2d4; --b3-protyle-inline-link-hover-color: #fa60a0; - --b3-protyle-inline-mark-background: #31a97b; + --b3-protyle-inline-mark-background: #31a97bc7; --b3-protyle-inline-mark-color: #cdd1d6; --b3-protyle-inline-tag-background: #65c8eccc; --b3-protyle-inline-tag-color: #f8f9fa; @@ -174,7 +174,7 @@ --custom-h5-color: #f2a1ff; --custom-h6-color: var(--b3-theme-on-background); --custom-blockquote-border-color: #6d9a9a29; - --custom-blockquote-background-color: #26333e; + --custom-blockquote-background-color: #50beff1a; --custom-tag-hover-color: #0892c3cc; --custom-link-bottom-color: #39464b96; } @@ -326,12 +326,12 @@ div[data-subtype='t'][data-type='NodeList'] { } /* 创建文件按钮 */ -.b3-button--text, +/* .b3-button--text, .b3-button--cancel, .b3-button--outline { color: #6bb6c9; background-color: transparent; -} +} */ .b3-button--text:hover, .b3-button--text:focus, .b3-button--cancel:hover, @@ -712,7 +712,6 @@ div[data-subtype='t'][data-type='NodeList'] { /* 设置备注样式 */ .b3-typography span[data-type~='inline-memo'], .protyle-wysiwyg span[data-type~='inline-memo'] { - background-color: var(--b3-card-warning-background); border-bottom: 2px solid var(--b3-font-color2); } @@ -772,37 +771,7 @@ div[data-subtype='t'][data-type='NodeList'] { .b3-typography blockquote, .protyle-wysiwyg [data-node-id].bq:not([style*='background-color']) { + /* border: 1px solid var(--custom-blockquote-border-color); */ border-left: 0.25em solid #456c74 !important; } - - - /* ⚙三级标题基本样式 */ -.protyle-wysiwyg [data-node-id].h3, -.b3-typography h3 { - - font-size: 1.35em !important; - color: var(--custom-h3-color) !important; - /* color: var(--b3-card-info-color) !important; */ - /* background-color: #30677d; */ - /* box-shadow: 2px 2px 5px #36393c; */ -} -/* 4. 四级标题样式setup */ -.protyle-wysiwyg [data-node-id].h4, -.b3-typography h4 { - font-size: 1.2em !important; - /* color: var(--custom-h4-color); */ - color: var(--b3-card-success-color); - /* background-color: #406e53; */ - /* box-shadow: 2px 2px 5px #36393c; */ - -} -/* 5. 五级标题样式setup */ -.protyle-wysiwyg [data-node-id].h5, -.b3-typography h5 { - font-size: 1.1em !important; - color: var(--custom-h5-color); - /* background-color: #bec6e891; */ - /* box-shadow: 2px 2px 5px #36393c; */ -} - diff --git a/style/theme/Tsundoku_green.css b/style/theme/Tsundoku_green.css index ae2122f..7945c56 100644 --- a/style/theme/Tsundoku_green.css +++ b/style/theme/Tsundoku_green.css @@ -191,7 +191,7 @@ --custom-blockquote-border-color: #6bb48133; --custom-blockquote-background-color: #a9d6b248; --custom-tag-hover-color: #3eadad; - --custom-link-bottom-color: #0a3a6418; + --custom-link-bottom-color: #4576a1; } body { background-color: transparent; @@ -460,12 +460,12 @@ div[data-subtype='t'][data-type='NodeList'] { } /* 创建文件按钮 */ -.b3-button--text, +/* .b3-button--text, .b3-button--cancel, .b3-button--outline { color: #3f9264; background-color: transparent; -} +} */ .b3-button--text:hover, .b3-button--text:focus, @@ -882,8 +882,8 @@ div[data-subtype='t'][data-type='NodeList'] { /* 设置备注样式 */ .b3-typography span[data-type~='inline-memo'], .protyle-wysiwyg span[data-type~='inline-memo'] { - background-color: var(--b3-card-warning-background); - border-bottom: 2px solid var(--b3-font-color1); + background-color: transparent; + border-bottom: 3px solid var(--b3-font-color1); } .tooltip--memo { @@ -972,4 +972,10 @@ span[data-type='av-add-more'] { .protyle-wysiwyg [data-node-id].bq:not([style*='background-color']) { border-left: 0.25em solid #8cae9b; color: #6a6969; +} + +[data-theme-mode="light"] .protyle-wysiwyg [data-node-id] span[data-type~='a']:hover { + color: var(--b3-protyle-inline-link-hover-color); + border-bottom: 2px solid var(--b3-protyle-inline-link-hover-color); + background-color: #c1eccb6e; } \ No newline at end of file diff --git a/theme.css b/theme.css index f01d693..e68b9de 100644 --- a/theme.css +++ b/theme.css @@ -2,7 +2,7 @@ /* 导入编辑器基础块和行内样式 */ @import url('style/editor.css'); /* 导入标题后缀提示样式 */ -@import url('style/module/h-reminder.css'); +/* @import url('style/module/h-reminder.css'); */ /* 导入代码块样式 */ @import url('style/module/code_block.css'); /* 导入自定义有序列表样式 */ @@ -10,7 +10,7 @@ /* 导入折叠样式css */ @import url('style/module/fold.css'); /* 导入超链接图标样式 */ -@import url('style/module/link_icon.css'); +/* @import url('style/module/link_icon.css'); */ /* 导入数据库样式 */ @import url('style/database.css'); /* 导入文档属性 */ @@ -185,14 +185,14 @@ --b3-protyle-inline-strong-color: #202124; --b3-protyle-inline-em-color: #202124; --b3-protyle-inline-s-color: #9ba0ad; - --b3-protyle-inline-link-color: #408bba; - --b3-protyle-inline-link-hover-color: #289be3; - --b3-protyle-inline-mark-background: #86e19a; + --b3-protyle-inline-link-color: #3375ab; + --b3-protyle-inline-link-hover-color: #2094f3; + --b3-protyle-inline-mark-background: #82d695a8; --b3-protyle-inline-mark-color: #202124; --b3-protyle-inline-tag-background: #70b3ca; --b3-protyle-inline-tag-color: #fff; - --b3-protyle-inline-code-color: #207e7d; - --b3-protyle-inline-code-background: #f0f0f0; + --b3-protyle-inline-code-color: #3779b3; + --b3-protyle-inline-code-background: #F3F4F4; --b3-protyle-inline-blockref-color: #0e7a88; --b3-protyle-inline-blockref-hover-color: #ff398b; @@ -211,17 +211,17 @@ --custom-tab-border: #d3dae27c; --custom-tab-focus-top-border: #435f6b; /* 各级标题颜色 */ - --custom-h1-color: #04393f; - --custom-h2-color: #18697d; + --custom-h1-color: rgba(15, 76, 129, 1); + --custom-h2-color: #083256; --custom-h2-border-color: #dfe0e1; - --custom-h3-color: #15aabf; - --custom-h4-color: #49896a; - --custom-h5-color: #421768; + --custom-h3-color: rgba(15, 76, 129, 1); + --custom-h4-color: #1c849e; + --custom-h5-color: #000000; --custom-h6-color: var(--b3-theme-on-background); - --custom-blockquote-border-color: #edefedbd; - --custom-blockquote-background-color: #f5f7f87d; + --custom-blockquote-border-color: #d0e2ee; + --custom-blockquote-background-color: #eaf7ff59; --custom-tag-hover-color: #559898; - --custom-link-bottom-color: #bacbd650; + --custom-link-bottom-color: #3375ab; } .render-node[data-subtype='graphviz'] .graph > polygon { @@ -388,18 +388,7 @@ body > div#action { } /* 文档图标标题上方大小调整win10 emoji */ -.protyle-background__icon { - height: 80px; - width: 80px; - transition: var(--b3-transition); - position: absolute; - /* bottom: -40px; */ - cursor: pointer; - /* font-size: 70px; - line-height: 70px; */ - text-align: center; - font-family: var(--b3-font-family-emoji); -} + /* 文档图标文件树大小调整 */ .file-tree .b3-list-item__icon svg, .file-tree .b3-list-item__icon img { @@ -727,21 +716,19 @@ body } /* 创建文件按钮 */ -.b3-button--text, +/* .b3-button--text, .b3-button--cancel, .b3-button--outline { color: #6b9ac9; background-color: transparent; -} +} */ .b3-button--text:hover, .b3-button--text:focus, .b3-button--cancel:hover, .b3-button--cancel:focus, .b3-button--outline:hover, .b3-button--outline:focus { - background-color: #89aba33d; - font-weight: 600; - transition: all 0.1s ease-in-out; + background-color: #848b8c3d; } /* 悬浮工具栏 */ .protyle-toolbar__item:hover { @@ -887,7 +874,6 @@ body font-size: 0.7em; opacity: 0.7; } - /* ----------------------------标签页、页签样式 Start----------------------------------------- */ .layout-tab-bar { @@ -936,6 +922,7 @@ body /* ----------------------------标签页、页签样式 END----------------------------------------- */ + .protyle-breadcrumb { background-color: transparent; } @@ -948,9 +935,9 @@ body } /* 块添加圆角 */ -.protyle-wysiwyg [data-node-id] { +/* .protyle-wysiwyg [data-node-id] { border-radius: 4px !important; -} +} */ /* 文件树文档图标悬浮放大 */ .b3-list--files .b3-list-item__icon { @@ -1090,12 +1077,8 @@ body display: none; } -/* 图片导出 */ -/* 超链接添加下划线 */ -.export-img .protyle-wysiwyg a { - /* border-bottom: 1px solid var(--b3-protyle-inline-blockref-color); */ - text-decoration: underline; -} + + /* 退出聚焦按钮添加背景色 */ .protyle-breadcrumb__icon[data-type='exit-focus'] { @@ -1143,5 +1126,18 @@ body padding: 0; } - + + + +/* 思源v3.0.12的文档添加标签、emoji样式调整 */ +.protyle-background__action .b3-button svg { + height: 13px; + width: 13px; + margin-right: 4px; + flex-shrink: 0; +} +.protyle-background__action .b3-button{ + font-size: 14px; + +} diff --git a/theme.json b/theme.json index 873990c..a918f39 100644 --- a/theme.json +++ b/theme.json @@ -2,7 +2,7 @@ "name": "Tsundoku", "author": "Achuan-2", "url": "https://github.com/Achuan-2/siyuan-themes-tsundoku", - "version": "2.0.5", + "version": "2.0.6", "displayName": { "default": "Tsundoku", "zh_CN": "積読"