From 3d9729e7b6988be2d65b6012c2104baf452d5432 Mon Sep 17 00:00:00 2001 From: Achuan-2 Date: Wed, 7 Dec 2022 19:10:23 +0800 Subject: [PATCH] :bookmark: v1.4.6 --- style/attr.css | 11 +++ style/code_block.css | 24 ++---- style/ctrlP.css | 105 ------------------------ style/ul.css | 191 ------------------------------------------- theme.css | 9 +- 5 files changed, 24 insertions(+), 316 deletions(-) delete mode 100644 style/ctrlP.css delete mode 100644 style/ul.css diff --git a/style/attr.css b/style/attr.css index b9cb243..9bbb0ba 100644 --- a/style/attr.css +++ b/style/attr.css @@ -283,4 +283,15 @@ rotyle-wysiwyg [data-node-id][custom-f="20"] div[contenteditable="true"]:after position: sticky; top: 1px; z-index: 1; +} + +/* 代码块输出code output */ +.protyle-wysiwyg [data-node-id][custom-code="output"] .protyle-action .protyle-action__language{ + opacity: 0; +} +.protyle-wysiwyg [data-node-id][custom-code="output"]{ + background-color: transparent; +} +.protyle-wysiwyg [data-node-id][custom-code="output"] .hljs{ + background-color: transparent !important; } \ No newline at end of file diff --git a/style/code_block.css b/style/code_block.css index 7100921..b61ce57 100644 --- a/style/code_block.css +++ b/style/code_block.css @@ -8,7 +8,6 @@ background-color: var(--b3-protyle-code-background) !important; border-radius: 0 0px 4px 0; /* background-image: url('../src/paper.png') !important; */ - } .code-block { @@ -21,23 +20,20 @@ /* background-image: url('../src/paper.png') !important; */ } -.protyle-wysiwyg[id="preview"] .code-block { +.protyle-wysiwyg[id='preview'] .code-block { box-shadow: 0 0 0 1.5px #1e25351a; } - .b3-typography .code-block .protyle-action .protyle-icon, .protyle-wysiwyg .code-block .protyle-action .protyle-icon { background-color: var(--b3-tooltips-color); } -.protyle-wysiwyg [data-node-id][fold="1"]:not(.li):not([data-type="NodeHeading"]).code-block { +.protyle-wysiwyg [data-node-id][fold='1']:not(.li):not([data-type='NodeHeading']).code-block { line-height: 1.625; height: 2px; } - - /* 语言标签 */ /* 代码语言显示 */ .protyle-wysiwyg .code-block .protyle-action .protyle-action__language { @@ -54,15 +50,17 @@ color: #7e888d; } -.protyle-wysiwyg .code-block[linenumber="true"] .protyle-action .protyle-action__language { +.protyle-wysiwyg .code-block[linenumber='true'] .protyle-action .protyle-action__language { margin: 3px 0 0 68px !important; } -.protyle-wysiwyg[contenteditable=true] .code-block .protyle-action .protyle-action__language:hover { +.protyle-wysiwyg[contenteditable='true'] + .code-block + .protyle-action + .protyle-action__language:hover { background-color: #a1abb161; } - .code-block .protyle-action .protyle-action__language:hover::after { opacity: 1; } @@ -75,7 +73,7 @@ /* 代码块行数*/ .protyle-linenumber__rows { - margin-top: 24px !important; + margin-top: 17px !important; background-color: var(--b3-protyle-code-background); font-family: var(--b3-font-family-code); opacity: 0.7; @@ -88,15 +86,12 @@ opacity: 0.5; } - - /* 按钮颜色 */ .b3-typography .code-block .protyle-action .protyle-icon, .protyle-wysiwyg .code-block .protyle-action .protyle-icon { background-color: #a1abb1; } - /* ------代码语言栏居右--------- */ /* .b3-typography .code-block .protyle-action, .protyle-wysiwyg [data-node-id].code-block .protyle-action { @@ -104,7 +99,6 @@ right: 4px; } */ - /* ---------mac三点--------- */ /* .code-block::after { content: ' '; @@ -117,4 +111,4 @@ height: 12px; width: 12px; z-index: 1; -} */ \ No newline at end of file +} */ diff --git a/style/ctrlP.css b/style/ctrlP.css deleted file mode 100644 index 04098d1..0000000 --- a/style/ctrlP.css +++ /dev/null @@ -1,105 +0,0 @@ -/* 来源:https://ld246.com/article/1648269766832 */ -/*链滴id:abbj*/ -/*---------ctrl+p窗口改造-------------*/ -/*放大ctrl+p窗口尺寸*/ -/*不添加[data-key]属性选择器将会同时影响alt+p窗口*/ -body>div[data-key]>.b3-dialog>.b3-dialog__container { - width: 90vw !important; -} - -body>div[data-key]>.b3-dialog>.b3-dialog__container>div>.fn__flex>.fn__flex-column { - height: 86vh !important; - width: 90vw !important; -} - -/* 调整搜索框关闭按钮位置, 避免被遮挡 */ -body>div[data-key]>.b3-dialog>.b3-dialog__container>svg.b3-dialog__close { - right: -25px; - /* z-index: 9999; */ -} -/*ctrl+p改造成左右排列*/ -/*先把容器改成左右排列并自动换行*/ -body>div[data-key]>.b3-dialog>.b3-dialog__container>div>.fn__flex>.fn__flex-column { - flex-direction: row !important; - flex-wrap: wrap; -} - -/*设置需要占满一行的项目*/ -body>div[data-key]>.b3-dialog>.b3-dialog__container>div>.fn__flex>.fn__flex-column .search__header, -body>div[data-key]>.b3-dialog>.b3-dialog__container>div>.fn__flex>.fn__flex-column>.b3-form__space--small { - width: 100%; -} - -/*窗口宽度大于一定尺寸时候,左右排列*/ -@media screen and (min-width: 960px) { - - /*搜索结果列表占一半宽度,靠左排列*/ - body>div[data-key]>.b3-dialog>.b3-dialog__container>div>.fn__flex>.fn__flex-column #searchList { - float: left; - width: 50% !important; - height: calc(100% - 135px) !important; - } - - /*结果预览自动占满剩余宽度,高度和结果列表等高*/ - div[data-key] .b3-dialog__container .fn__flex-column #searchPreview { - /*width:45vw;*/ - height: calc(100% - 136px) !important; - } -} - -@media screen and (min-width: 960px) { - - /*搜索结果列表占一半宽度,靠左排列*/ - body>div[data-key]>.b3-dialog>.b3-dialog__container>div>.fn__flex>.fn__flex-column .fn__none~#searchList { - float: left; - width: 35vw; - height: calc(100% - 85px) !important; - } - - /*结果预览自动占满剩余宽度,高度和结果列表等高*/ - body>div[data-key]>.b3-dialog>.b3-dialog__container>div>.fn__flex>.fn__flex-column .fn__none~#searchPreview { - /*width:45vw;*/ - height: calc(100% - 86px) !important; - } -} - -/*窗口宽度小于一定尺寸时候,上下排列*/ -@media screen and (max-width: 960px) { - body>div[data-key]>.b3-dialog>.b3-dialog__container>div>.fn__flex>.fn__flex-column #searchList { - float: left; - /*width:45vw;*/ - width: calc(100%); - height: calc(50% - 85px) !important; - } -} - -/*结果预览自动占满剩余宽度*/ -body>div[data-key]>.b3-dialog>.b3-dialog__container>div>.fn_flex>.fn__flex-column #searchPreview { - width: 45vw; -} - -/* 修复搜索文章不能完整显示的问题 */ -.spread-search__preview .protyle-content { - padding-bottom: 56px; -} - -div[data-key='⌘R'] #searchPreview .protyle-content { - padding-bottom: 90px; -} - -.fn__flex-column #searchList .b3-list-item[data-type='search-item'] { - padding-bottom: 20px; - border-radius: 0px; - box-shadow: 0 1px 0 0 var(--b3-toolbarSidebar) inset; -} - -.fn__flex-column #searchList .b3-list-item[data-type='search-item']>.b3-list-item__meta { - color: var(--b3-list-item--meta); - top: 22px; - right: 8px; - max-width: 34vw; - position: absolute; - white-space: nowrap; - overflow: hidden !important; - text-overflow: ellipsis; -} \ No newline at end of file diff --git a/style/ul.css b/style/ul.css deleted file mode 100644 index 50f3164..0000000 --- a/style/ul.css +++ /dev/null @@ -1,191 +0,0 @@ -.li[data-subtype="u"][fold="1"]>.protyle-action svg { - color: transparent; - background-color: #1757b5bb !important; - -webkit-mask: url(../src/ul/ul1.svg) no-repeat; - mask: url(../src/ul/ul1.svg) no-repeat; - -webkit-mask-size: 0.5em; - -webkit-mask-position: center; - mask-size: 0.5em; - mask-position: center; -} - -/* 第一层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul1.svg) no-repeat; - mask: url(../src/ul/ul1.svg) no-repeat; - -webkit-mask-size: 0.5em; - -webkit-mask-position: center; - mask-size: 0.5em; - mask-position: center; - -} - -/* 第二层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul2.svg) no-repeat; - mask: url(../src/ul/ul2.svg) no-repeat; - -webkit-mask-size: 0.46em; - -webkit-mask-position: center; - mask-size: 0.46em; - mask-position: center; -} - -/* 第三层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul3.svg) no-repeat; - mask: url(../src/ul/ul3.svg) no-repeat; - -webkit-mask-size: 0.39em; - -webkit-mask-position: center; - mask-size: 0.39em; - mask-position: center; -} - -/* 第四层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul1.svg) no-repeat; - mask: url(../src/ul/ul1.svg) no-repeat; - -webkit-mask-size: 0.5em; - -webkit-mask-position: center; - mask-size: 0.5em; - mask-position: center; -} - -/* 第五层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul2.svg) no-repeat; - mask: url(../src/ul/ul2.svg) no-repeat; - -webkit-mask-size: 0.46em; - -webkit-mask-position: center; - mask-size: 0.46em; - mask-position: center; -} - -/* 第六层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul3.svg) no-repeat; - mask: url(../src/ul/ul3.svg) no-repeat; - -webkit-mask-size: 0.39em; - -webkit-mask-position: center; - mask-size: 0.39em; - mask-position: center; -} - -/* 第七层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul1.svg) no-repeat; - mask: url(../src/ul/ul1.svg) no-repeat; - -webkit-mask-size: 0.5em; - -webkit-mask-position: center; - mask-size: 0.5em; - mask-position: center; -} - -/* 第八层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul2.svg) no-repeat; - mask: url(../src/ul/ul2.svg) no-repeat; - -webkit-mask-size: 0.46em; - -webkit-mask-position: center; - mask-size: 0.46em; - mask-position: center; -} - -/* 第九层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul3.svg) no-repeat; - mask: url(../src/ul/ul3.svg) no-repeat; - -webkit-mask-size: 0.39em; - -webkit-mask-position: center; - mask-size: 0.39em; - mask-position: center; -} - -/* 第十层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul1.svg) no-repeat; - mask: url(../src/ul/ul1.svg) no-repeat; - -webkit-mask-size: 0.5em; - -webkit-mask-position: center; - mask-size: 0.5em; - mask-position: center; -} - -/* 第十一层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul2.svg) no-repeat; - mask: url(../src/ul/ul2.svg) no-repeat; - -webkit-mask-size: 0.46em; - -webkit-mask-position: center; - mask-size: 0.46em; - mask-position: center; -} - -/* 第十二层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul3.svg) no-repeat; - mask: url(../src/ul/ul3.svg) no-repeat; - -webkit-mask-size: 0.39em; - -webkit-mask-position: center; - mask-size: 0.39em; - mask-position: center; -} - -/* 第十三层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul1.svg) no-repeat; - mask: url(../src/ul/ul1.svg) no-repeat; - -webkit-mask-size: 0.5em; - -webkit-mask-position: center; - mask-size: 0.5em; - mask-position: center; -} - -/* 第十四层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul2.svg) no-repeat; - mask: url(../src/ul/ul2.svg) no-repeat; - -webkit-mask-size: 0.46em; - -webkit-mask-position: center; - mask-size: 0.46em; - mask-position: center; -} - -/* 第十五层级 */ -.list[data-subtype="u"]>.li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"] .li[data-subtype="u"]>.protyle-action svg { - color: transparent; - background-color: var(--b3-theme-on-surface); - -webkit-mask: url(../src/ul/ul3.svg) no-repeat; - mask: url(../src/ul/ul3.svg) no-repeat; - -webkit-mask-size: 0.39em; - -webkit-mask-position: center; - mask-size: 0.39em; - mask-position: center; -} \ No newline at end of file diff --git a/theme.css b/theme.css index 39371fe..ddf494d 100644 --- a/theme.css +++ b/theme.css @@ -4,8 +4,6 @@ @import url("style/list2board.css"); @import url("style/list2map.css"); @import url("style/list2table.css"); -/* 导入搜索窗口调大样式 */ -@import url("style/ctrlP.css"); /* 导入文档属性 */ @import url("style/doc_attr.css"); /* 导入块自定义属性 */ @@ -279,7 +277,7 @@ body{ /* -------------------------------标题样式-------------------------------------- */ .protyle-wysiwyg [data-node-id].h1 ,.b3-typography h1{ - /* text-align: center; */ + text-align: center; border-bottom: 0px solid #c5c7ca !important; font-size: 1.75em !important; padding: 0.3em 4px; @@ -1732,7 +1730,7 @@ div[data-subtype='t'][data-type='NodeList'] { } ::-webkit-scrollbar-thumb{border-radius:0px;-webkit-box-shadow:inset 0 0 10px 10px #d5dde2;box-shadow:inset 0 0 10px 10px #d5dde2;background:unset;border-left:solid 4px transparent} ::-webkit-scrollbar-thumb:hover{border-radius:0px;-webkit-box-shadow:inset 0 0 10px 10px #d5dde2;box-shadow:inset 0 0 10px 10px #d5dde2;background:unset;border-left:solid 4px transparent} -/* ::-webkit-scrollbar-thumb:hover{border-left:solid 0px transparent;border-radius: 0px;} */ +::-webkit-scrollbar-thumb:hover{border-left:solid 0px transparent;border-radius: 0px;} .b3-typography span[data-type="em"], .protyle-wysiwyg span[data-type="em"], @@ -1907,4 +1905,5 @@ body>div#action{ border-left: .5px solid var(--b3-theme-background-light); top: 35px; left: 17px; -} */ \ No newline at end of file +} */ +