Merge pull request #75 from terwer/v4.x

Fix font
terwer · Mar 27, 2019 · b179212 · b179212
2 parents 6576cd3 + e430140
commit b179212
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/jvue-front/pages/common.css b/jvue-front/pages/common.css
@@ -3,7 +3,7 @@
 * 注意：每个主题都要引用这个样式
 */
 body {
-  font-family: "Microsoft Yahei", Helvetica, Arial, Verdana, Tahoma, sans-serif !important;
+  font-family: dejavu sans mono,Fira Code,Microsoft Yahei,Consolas,Courier New,monospace,Menlo,Monaco !important;
   color: #666 !important;
 }
 body,

diff --git a/jvue-front/plugins/lib/vue-hljs/vs.css b/jvue-front/plugins/lib/vue-hljs/vs.css
@@ -1,17 +1,18 @@
 code{
-  font-family: "dejavu sans mono","Fira Code",Menlo,Monaco,Consolas,"Courier New",monospace;
-  color: red;
+  font-family: dejavu sans mono,Fira Code,Microsoft Yahei,Consolas,Courier New,monospace,Menlo,Monaco;
+  font-size: 14px;  color: red;
 }
 .hljs {
-    font-family: "dejavu sans mono","Fira Code",Menlo,Monaco,Consolas,"Courier New",monospace;
-    display: block;
-    overflow-x: auto;
-    padding: .5em;
-    line-height: 1.6;
-    color: black;
-    background-color: #f5f5f5!important;
-    border: 1px solid #ccc!important;
-    border-radius: 3px!important;
+  font-family: dejavu sans mono,Fira Code,Microsoft Yahei,Consolas,Courier New,monospace,Menlo,Monaco;
+  font-size: 14px;
+  display: block;
+  overflow-x: auto;
+  padding: .5em;
+  line-height: 1.6;
+  color: black;
+  background-color: #f5f5f5!important;
+  border: 1px solid #ccc!important;
+  border-radius: 3px!important;
 }
 
 .hljs-comment, .hljs-quote, .hljs-variable {

diff --git a/jvue-front/plugins/lib/vue-hljs/vs2015.css b/jvue-front/plugins/lib/vue-hljs/vs2015.css
@@ -1,9 +1,9 @@
 code{
-  font-family: "dejavu sans mono","Fira Code",Menlo,Monaco,Consolas,"Courier New",monospace;
+  font-family: dejavu sans mono,Fira Code,Microsoft Yahei,Menlo,Monaco,Consolas,Courier New,monospace;
   color: #D69D85;
 }
 .hljs {
-  font-family: "dejavu sans mono","Fira Code",Menlo,Monaco,Consolas,"Courier New",monospace;
+  font-family: dejavu sans mono,Fira Code,Microsoft Yahei,Menlo,Monaco,Consolas,Courier New,monospace;
   display: block;
   overflow-x: auto;
   padding: .5em;