diff --git a/g2-left.css b/g2-left.css index 20e4726..882f89a 100644 --- a/g2-left.css +++ b/g2-left.css @@ -1,12 +1,13 @@ /* 如有不懂,参看 https://theme.typora.io/doc/zh/Write-Custom-Theme/ */ -@import 'zj/fonts.css'; - :root { +@import "zj/fonts.css"; +:root { --side-bar-bg-color: #fff; --control-text-color: #777; /* --font-sans-serif: 'PingFangSC-Regular', 'Microsoft YaHei', , 'Source Sans Pro', sans-serif !important; */ - --font-sans-serif: 'Source Han SerifCN', 'Microsoft YaHei', sans-serif !important; - --font-monospace: 'Source Code Pro Medium',Courier, monospace, 'Courier New', 'Roboto Mono', 'Source Sans Pro', 'Microsoft YaHei' !important; + --font-sans-serif: "Source Han SerifCN", "Microsoft YaHei", sans-serif !important; + --font-monospace: "Source Code Pro Medium", Courier, monospace, + "Courier New", "Roboto Mono", "Source Sans Pro", "Microsoft YaHei" !important; /* 主题色 */ --main-1: #fff3f0; --main-2: #ffd4cc; @@ -39,19 +40,16 @@ body { margin: 0; } - /* #write 为写入区域 */ #write { - max-width: 860px; + max-width: 1280px; padding: 20px 30px 160px; margin: 0 auto; } - /* 根据窗口的大小调整写作区域 */ - /* @media only screen and (min-width: 1400px) { #write { max-width: 1024px; @@ -64,21 +62,19 @@ body { } } */ - /* 正常文字 */ #write p { line-height: 1.6rem; - word-spacing: .05rem; + word-spacing: 0.05rem; color: black; } -#write>ul:first-child, -#write>ol:first-child { +#write > ul:first-child, +#write > ol:first-child { margin-top: 30px; } - /* 链接 */ a { @@ -91,31 +87,28 @@ a { /* text-decoration-color: #0366d6; */ } - /* 加粗 */ strong { padding: 0.1em; /* color: #dc3545; */ - color: #E91E63; + color: #e91e63; font-weight: 600; /* font-family: 'Microsoft YaHei'; */ /* font-size: 90%; */ } - /* 斜体强调 */ em { font-style: normal; - background-color: #EBFFEB; + background-color: #ebffeb; border-radius: 2px; padding: 2px 4px; margin: 0 2px; color: black; } - /* 行内数学公式变蓝 */ .md-inline-math { @@ -123,7 +116,6 @@ em { font-size: 100%; } - /* 行间数学公式 */ [mdtype="math_block"] { @@ -132,49 +124,44 @@ em { /* color: blue; */ } - /* .MathJax_SVG svg { font-size: 110%; color: blue; zoom: 1 } */ - /* 标题编号初始化 */ - /* 首先全局进行一次reset,这样即使不添加h1标题也可以使用较低级别的标题 */ #write { - counter-reset: h2 0 h3 0 h4 0 h5 0 h6 0 + counter-reset: h2 0 h3 0 h4 0 h5 0 h6 0; } - /* #write { counter-reset: h1 } */ h1 { - counter-reset: h2 + counter-reset: h2; } h2 { - counter-reset: h3 + counter-reset: h3; } h3 { - counter-reset: h4 + counter-reset: h4; } h4 { - counter-reset: h5 + counter-reset: h5; } h5 { - counter-reset: h6 + counter-reset: h6; } - /** put counter result into headings */ #write h1:before { @@ -184,40 +171,40 @@ h5 { #write h2:before { counter-increment: h2; - content: counter(h2) ". " + content: counter(h2) ". "; } #write h3:before, h3.md-focus.md-heading:before { counter-increment: h3; - content: counter(h2) "." counter(h3) " " + content: counter(h2) "." counter(h3) " "; } #write h4:before, h4.md-focus.md-heading:before { counter-increment: h4; - content: counter(h2) "." counter(h3) "." counter(h4) " " + content: counter(h2) "." counter(h3) "." counter(h4) " "; } #write h5:before, h5.md-focus.md-heading:before { counter-increment: h5; - content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) " " + content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) " "; } #write h6:before, h6.md-focus.md-heading:before { counter-increment: h6; - content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) "." counter(h6) " " + content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) "." + counter(h6) " "; } - /** override the default style for focused headings */ -#write>h3.md-focus:before, -#write>h4.md-focus:before, -#write>h5.md-focus:before, -#write>h6.md-focus:before, +#write > h3.md-focus:before, +#write > h4.md-focus:before, +#write > h5.md-focus:before, +#write > h6.md-focus:before, h3.md-focus:before, h4.md-focus:before, h5.md-focus:before, @@ -291,10 +278,9 @@ h6 code { font-size: inherit; } - /* h1标题样式 */ h1[title] { - color:rgba(0, 92, 197, 0.8); + color: rgba(0, 92, 197, 0.8); padding: 0em 0 0.5em 0; color: #334257; } @@ -302,13 +288,11 @@ h1[title] { h1:not([title]) { margin-top: 2.2rem; text-align: left; - padding-bottom: .2em; + padding-bottom: 0.2em; font-size: 2.25em; line-height: 1.2; border-bottom: 2px solid var(--main-6); display: inline-block; - - } /* h1:after { @@ -327,13 +311,11 @@ h1:not([title]) { width: 4em; height: 2px; /* border-bottom: 2px solid var(--main-6); */ -} */ - /* h2标题样式 */ h2 { - padding-bottom: .2em; + padding-bottom: 0.2em; font-size: 1.75em; line-height: 1.225; border-bottom: 1px solid #eee; @@ -366,8 +348,8 @@ table { margin: 0.8em 0; } -li>ol, -li>ul { +li > ol, +li > ul { margin: 0 0; } @@ -381,25 +363,24 @@ hr { box-sizing: content-box; } - /* 列表环境 */ -#write ol>li, -#write ul>li { +#write ol > li, +#write ul > li { /* color: #db4d52; */ color: #f50057; font-weight: bold; } -#write ol>li>*, -#write ul>li>* { +#write ol > li > *, +#write ul > li > * { color: #333; font-weight: normal; } -#write ol>li>*:not(ol):not(ul), -#write ul>li>*:not(ol):not(ul) { - padding-left: .25rem; +#write ol > li > *:not(ol):not(ul), +#write ul > li > *:not(ol):not(ul) { + padding-left: 0.25rem; } #write ul { @@ -418,7 +399,6 @@ table { word-break: initial; } - /* tr元素定义表格行 */ table tr { @@ -429,10 +409,9 @@ table tr { table tr:nth-child(2n), thead { - background-color: #F6F8FA; + background-color: #f6f8fa; } - /* th元素定义表头 */ table tr th { @@ -444,7 +423,6 @@ table tr th { padding: 6px 13px; } - /* td元素定义表格单元格 */ table tr td { @@ -464,15 +442,12 @@ table tr td:last-child { margin-bottom: 0; } - /* 行号与代码之间的框线 */ - /* #write .CodeMirror-gutters { border-right: none; } */ - /* 行号 */ .cm-s-inner .CodeMirror-linenumber { @@ -482,17 +457,15 @@ border-right: none; color: rgba(0, 92, 197, 0.8); } - /* .CodeMirror-lines { padding-left: 4px; } */ .code-tooltip { - box-shadow: 0 1px 1px 0 rgba(0, 28, 36, .3); + box-shadow: 0 1px 1px 0 rgba(0, 28, 36, 0.3); border-top: 1px solid #eef2f2; } - /* 代码框 */ #write .md-fences { @@ -516,14 +489,12 @@ padding-left: 4px; padding-left: 12px; } - /* 代码框中光标颜色 */ #write .CodeMirror-cursors .CodeMirror-cursor { border-left: 2px solid var(--main-4); } - /* 行内代码 */ #write code, @@ -535,8 +506,8 @@ tt { font-family: var(--font-monospace); /* font-family: 'Source Code Pro', 'Microsoft YaHei'!important; */ font-size: 0.9rem; - color: #FF0000; - background-color: #FAEAEB; + color: #ff0000; + background-color: #faeaeb; } tt { @@ -548,10 +519,9 @@ tt { color: #e96900; } - /* 任务列表小方框 */ -.md-task-list-item>input { +.md-task-list-item > input { margin-left: -1.3em; } @@ -570,35 +540,35 @@ tt { margin-top: 0 !important; } -.mathjax-block>.code-tooltip { - bottom: .375rem; +.mathjax-block > .code-tooltip { + bottom: 0.375rem; } .md-mathjax-midline { background: #fafafa; } -#write>h3.md-focus:before { +#write > h3.md-focus:before { left: -1.5625rem; - top: .375rem; + top: 0.375rem; } -#write>h4.md-focus:before { +#write > h4.md-focus:before { left: -1.5625rem; - top: .285714286rem; + top: 0.285714286rem; } -#write>h5.md-focus:before { +#write > h5.md-focus:before { left: -1.5625rem; - top: .285714286rem; + top: 0.285714286rem; } -#write>h6.md-focus:before { +#write > h6.md-focus:before { left: -1.5625rem; - top: .285714286rem; + top: 0.285714286rem; } -.md-image>.md-meta { +.md-image > .md-meta { /*border: 1px solid #ddd;*/ border-radius: 3px; padding: 2px 0px 0px 4px; @@ -616,12 +586,10 @@ tt { padding-bottom: 20px; } - /************************************** * Header Counters in TOC **************************************/ - /* No link underlines in TOC */ .md-toc-inner { @@ -638,36 +606,36 @@ tt { margin-left: 0; font-size: 1.5rem; display: none; - counter-reset: h2toc + counter-reset: h2toc; } .md-toc-h2 { font-size: 1.1rem; margin-left: 2rem; - counter-reset: h3toc + counter-reset: h3toc; } .md-toc-h3 { margin-left: 3rem; - font-size: .9rem; - counter-reset: h4toc + font-size: 0.9rem; + counter-reset: h4toc; } .md-toc-h4 { margin-left: 4rem; - font-size: .85rem; - counter-reset: h5toc + font-size: 0.85rem; + counter-reset: h5toc; } .md-toc-h5 { margin-left: 5rem; - font-size: .8rem; - counter-reset: h6toc + font-size: 0.8rem; + counter-reset: h6toc; } .md-toc-h6 { margin-left: 6rem; - font-size: .75rem; + font-size: 0.75rem; } .md-toc-h1:before { @@ -682,7 +650,7 @@ tt { .md-toc-h2:before { color: black; counter-increment: h2toc; - content: counter(h2toc) ". " + content: counter(h2toc) ". "; } .md-toc-h2 .md-toc-inner { @@ -692,7 +660,7 @@ tt { .md-toc-h3:before { color: black; counter-increment: h3toc; - content: counter(h2toc) ". " counter(h3toc) " " + content: counter(h2toc) ". " counter(h3toc) " "; } .md-toc-h3 .md-toc-inner { @@ -702,7 +670,7 @@ tt { .md-toc-h4:before { color: black; counter-increment: h4toc; - content: counter(h2toc) ". " counter(h3toc) ". " counter(h4toc) " " + content: counter(h2toc) ". " counter(h3toc) ". " counter(h4toc) " "; } .md-toc-h4 .md-toc-inner { @@ -712,7 +680,8 @@ tt { .md-toc-h5:before { color: black; counter-increment: h5toc; - content: counter(h2toc) ". " counter(h3toc) ". " counter(h4toc) ". " counter(h5toc) " " + content: counter(h2toc) ". " counter(h3toc) ". " counter(h4toc) ". " + counter(h5toc) " "; } .md-toc-h5 .md-toc-inner { @@ -722,73 +691,73 @@ tt { .md-toc-h6:before { color: black; counter-increment: h6toc; - content: counter(h2toc) ". " counter(h3toc) ". " counter(h4toc) ". " counter(h5toc) ". " counter(h6toc) " " + content: counter(h2toc) ". " counter(h3toc) ". " counter(h4toc) ". " + counter(h5toc) ". " counter(h6toc) " "; } .md-toc-h6 .md-toc-inner { margin-left: 0; } - /* 侧栏自动编号 */ .sidebar-content { - counter-reset: h2 0 h3 0 h4 0 h5 0 h6 0 + counter-reset: h2 0 h3 0 h4 0 h5 0 h6 0; } - /* .sidebar-content { counter-reset: h1 } */ .outline-h1 { - counter-reset: h2 + counter-reset: h2; } .outline-h2 { - counter-reset: h3 + counter-reset: h3; } .outline-h3 { - counter-reset: h4 + counter-reset: h4; } .outline-h4 { - counter-reset: h5 + counter-reset: h5; } .outline-h5 { - counter-reset: h6 + counter-reset: h6; } -.outline-h1>.outline-item>.outline-label:before { +.outline-h1 > .outline-item > .outline-label:before { counter-increment: h1; /* content: counter(h1) ". " */ } -.outline-h2>.outline-item>.outline-label:before { +.outline-h2 > .outline-item > .outline-label:before { counter-increment: h2; - content: counter(h2) ". " + content: counter(h2) ". "; } -.outline-h3>.outline-item>.outline-label:before { +.outline-h3 > .outline-item > .outline-label:before { counter-increment: h3; - content: counter(h2) "." counter(h3) " " + content: counter(h2) "." counter(h3) " "; } -.outline-h4>.outline-item>.outline-label:before { +.outline-h4 > .outline-item > .outline-label:before { counter-increment: h4; - content: counter(h2) "." counter(h3) "." counter(h4) " " + content: counter(h2) "." counter(h3) "." counter(h4) " "; } -.outline-h5>.outline-item>.outline-label:before { +.outline-h5 > .outline-item > .outline-label:before { counter-increment: h5; - content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) " " + content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) " "; } -.outline-h6>.outline-item>.outline-label:before { +.outline-h6 > .outline-item > .outline-label:before { counter-increment: h6; - content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) "." counter(h6) " " + content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) "." + counter(h6) " "; } .sidebar-tabs { @@ -801,13 +770,12 @@ tt { } #typora-quick-open-item { - background-color: #FAFAFA; - border-color: #FEFEFE #e5e5e5 #e5e5e5 #eee; + background-color: #fafafa; + border-color: #fefefe #e5e5e5 #e5e5e5 #eee; border-style: solid; border-width: 1px; } - /** focus mode */ .on-focus-mode blockquote { @@ -836,7 +804,7 @@ footer { } .html-for-mac .context-menu { - --item-hover-bg-color: #E6F0FE; + --item-hover-bg-color: #e6f0fe; } #md-notification .btn { @@ -856,7 +824,6 @@ footer { background: #999; } - /* 打印成PDF */ @media print { @@ -864,19 +831,19 @@ footer { -webkit-print-color-adjust: exact; } html { - font-size: 15px!important; + font-size: 15px !important; } body { /* font-size: 16px!important; */ /* font-family: 'Source Han SerifCN', "Times New Roman", Times, 'SimSun', serif!important; */ - font-family: "Times New Roman", Times, 'SimSun', serif!important; - color: #000000!important; + font-family: "Times New Roman", Times, "SimSun", serif !important; + color: #000000 !important; } p { - color: #000000!important; + color: #000000 !important; } a { - color: blue!important; + color: blue !important; } table, pre { @@ -885,4 +852,4 @@ footer { pre { word-wrap: break-word; } -} \ No newline at end of file +} diff --git a/github.css b/github.css index a77ec26..d2a5642 100644 --- a/github.css +++ b/github.css @@ -283,11 +283,8 @@ code { html { font-size: 13px; } - table, pre { page-break-inside: avoid; - } - pre { word-wrap: break-word; } } diff --git a/night.css b/night.css index e84b146..90ba6a7 100644 --- a/night.css +++ b/night.css @@ -1014,4 +1014,9 @@ footer.ty-footer { .clear-btn-icon { top: 8px; -} \ No newline at end of file +} + +/* try fix https://github.com/typora/typora-issues/issues/5253 */ +.file-node-expanded>.file-node-children { + display: grid; + } \ No newline at end of file diff --git a/old-themes/github.css b/old-themes/github.css index a77ec26..d2a5642 100644 --- a/old-themes/github.css +++ b/old-themes/github.css @@ -283,11 +283,8 @@ code { html { font-size: 13px; } - table, pre { page-break-inside: avoid; - } - pre { word-wrap: break-word; } } diff --git a/old-themes/night.css b/old-themes/night.css index e84b146..90ba6a7 100644 --- a/old-themes/night.css +++ b/old-themes/night.css @@ -1014,4 +1014,9 @@ footer.ty-footer { .clear-btn-icon { top: 8px; -} \ No newline at end of file +} + +/* try fix https://github.com/typora/typora-issues/issues/5253 */ +.file-node-expanded>.file-node-children { + display: grid; + } \ No newline at end of file diff --git a/themes.rar b/themes.rar new file mode 100644 index 0000000..49702e7 Binary files /dev/null and b/themes.rar differ