From 4496b4ba4cfa0444bd00d22e57082fb7983df290 Mon Sep 17 00:00:00 2001
From: life <lealife@outlook.com>
Date: Mon, 23 May 2016 13:05:04 +0800
Subject: [PATCH] markdown vim mode

---
 .../logo/{leanote_icon_blue.png => leanote.png}    | Bin
 public/themes/basic.less                           |  13 ++++++++++---
 public/themes/default.css                          |  10 ++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)
 rename public/images/logo/{leanote_icon_blue.png => leanote.png} (100%)

diff --git a/public/images/logo/leanote_icon_blue.png b/public/images/logo/leanote.png
similarity index 100%
rename from public/images/logo/leanote_icon_blue.png
rename to public/images/logo/leanote.png
diff --git a/public/themes/basic.less b/public/themes/basic.less
index 32128040..6b35c7ef 100644
--- a/public/themes/basic.less
+++ b/public/themes/basic.less
@@ -3,6 +3,7 @@
 @fontFamily: 'Open Sans', 'Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei', "WenQuanYi Micro Hei", "Droid Sans Mono", "Droid Sans Fallback",sans-serif;
 // @aceFontFamily: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', "Microsoft YaHei", "微软雅黑";
 @aceFontFamily: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', Hiragino Sans GB, "Microsoft YaHei", "微软雅黑";
+@aceFontFamily: Menlo, 'Ubuntu Mono', Consolas, 'Courier New', 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
 
 // font
 @font-face {
@@ -1188,9 +1189,15 @@ h1, h2, h3 {
 }
 
 // ace 重置css, 必须
-.ace_editor, .ace_editor * {
-	// font: 14px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
-	font-family: @aceFontFamily !important; // 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro';
+#left-column {
+    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
+}
+.ace_editor {
+    font-family: @aceFontFamily;
+	// font-family: @aceFontFamily !important; // 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro';
+}
+.ace_editor *  {
+    font-family: inherit;
 }
 
 /* leanote nav */
diff --git a/public/themes/default.css b/public/themes/default.css
index 75549101..5d98adc3 100644
--- a/public/themes/default.css
+++ b/public/themes/default.css
@@ -1298,9 +1298,11 @@ h3 {
 .dropdown-menu .divider {
   margin: 3px 0;
 }
-.ace_editor,
+.ace_editor {
+  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
+}
 .ace_editor * {
-  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', Hiragino Sans GB, "Microsoft YaHei", "微软雅黑" !important;
+  font-family: inherit;
 }
 /* leanote nav */
 .leanoteNav {
@@ -1403,7 +1405,7 @@ h3 {
   text-decoration: underline;
 }
 #editorContent pre {
-  font: 12px / normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', Hiragino Sans GB, "Microsoft YaHei", "微软雅黑";
+  font: 12px / normal Menlo, 'Ubuntu Mono', Consolas, 'Courier New', 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
   color: #4D4D4C;
 }
 #editorContent .ace-tomorrow {
@@ -2964,7 +2966,7 @@ body,
 #md-keyboard-mode {
   color: #8E8E8E;
   font-size: 12px;
-  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', Hiragino Sans GB, "Microsoft YaHei", "微软雅黑";
+  font-family: Menlo, 'Ubuntu Mono', Consolas, 'Courier New', 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
   font-style: normal;
 }
 /*