From e1a701dc8f4add4c64366f433a9169f46a578540 Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Mon, 3 Oct 2016 03:21:21 +0900 Subject: [PATCH 1/3] Stop overriding font-family in default theme /w speficied update of github-markdown-css --- package.json | 2 +- sass/themes/default.sass | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index 1478ea5..d868227 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "dependencies": { "codemirror": "^5.11.0", "extend": "^3.0.0", - "github-markdown-css": "^2.2.1", + "github-markdown-css": "^2.4.1", "highlight.js": "^9.1.0", "iconv-lite": "^0.4.13", "jquery": "^3.0.0", diff --git a/sass/themes/default.sass b/sass/themes/default.sass index 9a6e97a..dde976e 100644 --- a/sass/themes/default.sass +++ b/sass/themes/default.sass @@ -19,12 +19,8 @@ color: #666 .markdown-body - font-family: 'A-OTF UD Shin Go Pro', 'Noto Sans Japanese', 'Kozuka Gothic Pr6N', 'Kozuka Gothic Pro', 'Meiryo UI', 'Meiryo', 'Helvetica Neue', Helvetica, 'Segoe UI', Arial, freesans, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol' font-size: 29px - tt, code - font-family: 'SourceHanCodeJP-Normal', 'Ricty', Consolas, "Liberation Mono", Menlo, Courier, monospace - h1 font-size: 1.6em color: #246 From 93d4177690d59c88b50f6ffecfdd4d7aab81e57f Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Mon, 3 Oct 2016 03:25:29 +0900 Subject: [PATCH 2/3] Remove Gaia theme's Japanese font families /w emoji support by Apple and Microsoft fonts --- sass/themes/gaia.sass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sass/themes/gaia.sass b/sass/themes/gaia.sass index 89404b7..61d0513 100644 --- a/sass/themes/gaia.sass +++ b/sass/themes/gaia.sass @@ -59,7 +59,7 @@ $highlight-color: #0288d1 +body-slide-mode .markdown-body font-size: calc(0.045px * var(--slide-height)) - font-family: 'Lato', 'Avenir Next', 'Avenir', 'Trebuchet MS', 'Segoe UI', 'Hiragino Kaku Gothic ProN', 'Meiryo', sans-serif + font-family: 'Lato', 'Avenir Next', 'Avenir', 'Trebuchet MS', 'Segoe UI', sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" line-height: 1.3 letter-spacing: 1.25px word-wrap: break-word @@ -170,4 +170,3 @@ $highlight-color: #0288d1 &[data-template~="gaia"] +color-template($highlight-color, $bg-color, #81d4fa) - From 51fb0770ac4bd03fec0bab0dd3a846ed5db5c05c Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Mon, 3 Oct 2016 03:37:49 +0900 Subject: [PATCH 3/3] Remove Japanese fonts from initial font of editor --- coffee/classes/mds_config.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coffee/classes/mds_config.coffee b/coffee/classes/mds_config.coffee index e1649b9..aac0e6a 100644 --- a/coffee/classes/mds_config.coffee +++ b/coffee/classes/mds_config.coffee @@ -11,7 +11,7 @@ class MdsConfig @initialConfig: editor: - fontFamily: 'Osaka-mono, "MS Gothic", monospace' + fontFamily: 'Consolas, monaco, monospace' fontSize: '14px' fileHistory: [] fileHistoryMax: 8