diff --git a/categories/index.html b/categories/index.html index e4261ab..efda60e 100644 --- a/categories/index.html +++ b/categories/index.html @@ -63,7 +63,7 @@
diff --git a/css/codemirror.css b/css/codemirror.css index 355c996..52a97a0 100644 --- a/css/codemirror.css +++ b/css/codemirror.css @@ -1,3 +1,7 @@ +@font-face { + font-family: "JetBrains Mono"; + src: url("/font/JetBrainsMono.woff") format("woff"), url("/font/JetBrainsMono.ttf") format("truetype"); +} pre code .language-mark { position: absolute; top: 15px; @@ -49,7 +53,7 @@ pre code .language-mark b { .CodeMirror .CodeMirror-gutters, .CodeMirror .CodeMirror-linenumber { background: #201c29 !important; - padding: 0 3px 0 15px; + padding: 0 3px 0 10px; } .CodeMirror .CodeMirror-scroll { padding: 55px 30px 60px 10px !important; @@ -59,6 +63,6 @@ pre code .language-mark b { width: 100%; } .CodeMirror .CodeMirror-lines { - font-size: 0.8rem; - font-family: Rubik, Lato, lucida grande, lucida sans unicode, Tahoma, 'Microsoft Yahei', 'WenQuanYi Micro Hei', sans-serif; + font-size: 0.7rem; + font-family: "JetBrains Mono", Rubik, Lato, lucida grande, lucida sans unicode, Tahoma, 'Microsoft Yahei', 'WenQuanYi Micro Hei', sans-serif; } diff --git a/css/obsidian.css b/css/obsidian.css index f4cc2c3..36b9417 100644 --- a/css/obsidian.css +++ b/css/obsidian.css @@ -30,6 +30,10 @@ background: -webkit-linear-gradient(to right, var(--dark), var(--secondary), var(--primary)) !important; background: linear-gradient(to right, var(--dark), var(--secondary), var(--primary)) !important; } +@font-face { + font-family: "JetBrains Mono"; + src: url("/font/JetBrainsMono.woff") format("woff"), url("/font/JetBrainsMono.ttf") format("truetype"); +} pre code .language-mark { position: absolute; top: 15px; @@ -80,7 +84,7 @@ pre code .language-mark b { .CodeMirror .CodeMirror-gutters, .CodeMirror .CodeMirror-linenumber { background: #201c29 !important; - padding: 0 3px 0 15px; + padding: 0 3px 0 10px; } .CodeMirror .CodeMirror-scroll { padding: 55px 30px 60px 10px !important; @@ -90,8 +94,8 @@ pre code .language-mark b { width: 100%; } .CodeMirror .CodeMirror-lines { - font-size: 0.8rem; - font-family: Rubik, Lato, lucida grande, lucida sans unicode, Tahoma, 'Microsoft Yahei', 'WenQuanYi Micro Hei', sans-serif; + font-size: 0.7rem; + font-family: "JetBrains Mono", Rubik, Lato, lucida grande, lucida sans unicode, Tahoma, 'Microsoft Yahei', 'WenQuanYi Micro Hei', sans-serif; } /* Responsive style */ body { @@ -220,7 +224,7 @@ html.loading { } a { text-decoration: none; - color: var(--secondary); + color: var(--secondary) !important; } a:hover { text-decoration: none; @@ -2691,7 +2695,6 @@ h1.title { font-weight: bold; } .content a { - color: #ddd; transition: all 200ms ease-in-out; position: relative; font-weight: 900; @@ -2956,7 +2959,7 @@ code { opacity: 0.9; } pre { - font-family: 'Rubik', 'Microsoft Yahei', 'WenQuanYi Micro Hei', sans-serif !important; + font-family: 'JetBrains Mono', 'Rubik', 'Microsoft Yahei', 'WenQuanYi Micro Hei', sans-serif !important; margin: 2em 0; } pre .comment { diff --git a/font/JetBrainsMono.ttf b/font/JetBrainsMono.ttf new file mode 100644 index 0000000..dfbece6 Binary files /dev/null and b/font/JetBrainsMono.ttf differ diff --git a/font/JetBrainsMono.woff b/font/JetBrainsMono.woff new file mode 100644 index 0000000..dc22418 Binary files /dev/null and b/font/JetBrainsMono.woff differ diff --git a/js/obsidian.js b/js/obsidian.js index 567fc0d..5db24a3 100644 --- a/js/obsidian.js +++ b/js/obsidian.js @@ -422,7 +422,7 @@ var Obsidian = { item.empty(); var myCodeMirror = CodeMirror(this, { - value: $code, + value: $code.slice(0, $code.length - 1), mode: Obsidian.getCodeMirrorMode(lang), lineNumbers: !item.is('.inline'), readOnly: true, diff --git a/search.xml b/search.xml index a5dca7c..d245fec 100644 --- a/search.xml +++ b/search.xml @@ -45,10 +45,10 @@