From 6122cc1a32ace6da9b1edd23e5094748c7440cea Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Wed, 16 Sep 2015 13:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/css/admin.css  | 2 +-
 static/src/css/global.css | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/static/src/css/admin.css b/static/src/css/admin.css
index fb9c9f2..6a613e7 100644
--- a/static/src/css/admin.css
+++ b/static/src/css/admin.css
@@ -1,4 +1,3 @@
-@import url("global.css");
 @import url("bootstrap/bootstrap.min.css");
 @import url("bootstrap/todc-bootstrap.min.css");
 @import url("codeMirror/codemirror.css");
@@ -6,6 +5,7 @@
 @import url("webuploader/webuploader.css");
 @import url("datetime_picker/bootstrap-datetimepicker.css");
 @import url("tagEditor/jquery.tag-editor.css");
+@import url("global.css");
 
 #loading-gif {
     width: 40px;
diff --git a/static/src/css/global.css b/static/src/css/global.css
index 2d38931..2d4f618 100644
--- a/static/src/css/global.css
+++ b/static/src/css/global.css
@@ -1,5 +1,5 @@
 body, button, input, select, textarea, h1, h2, h3, h4, h5, h6 {
-    font-family: Georgia, STHeiti, "Microsoft Yahei";
+    font-family: Georgia, STHeiti, "Microsoft Yahei", SimSun, "Droid Sans";
 }
 
 html {
@@ -40,5 +40,5 @@ label {
 
 
 pre {
-    font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important;
+    font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
 }