From d8b69fe7d1ad3ab5f95dddce5383efba0635d430 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 29 Apr 2019 14:02:29 +0800
Subject: [PATCH] css

---
 public/static/admin/default/css/common.css | 4 ++--
 public/static/common/css/common.css        | 3 ---
 public/static/index/default/css/common.css | 1 +
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css
index 9a2791d79..9e7212ce3 100755
--- a/public/static/admin/default/css/common.css
+++ b/public/static/admin/default/css/common.css
@@ -53,7 +53,7 @@ input:hover, select:hover, textarea:hover, .chosen-choices:hover, .chosen-single
 
 body {margin:0;color:#797979;}
 html,body {position:relative;background:#fff;height:100%;width:100%;}
-h1,h2,h3,h4,h5,h6 {margin:10px 0;}
+h1,h2,h3,h4,h5,h6 {font-family:'Karla',sans-serif;margin:10px 0;}
 h1 {line-height:43px;}
 h2 {line-height:35px;}
 h3 small {color:#444444;}
@@ -270,7 +270,7 @@ a:focus {outline:0;text-decoration:none;}
 .nav-tabs > .active > a,.nav-tabs > .active > a:focus,.nav-tabs > .active > a:hover {border:2px solid #eeeeee !important;border-bottom-color:#ffffff !important;}
 .nav-tabs {border-bottom:2px solid #eeeeee;}
 .nav-tabs > li {margin-bottom:-2px;}
-.nav-tabs a {color:#435966;font-size:15px;font-weight:600;}
+.nav-tabs a {color:#435966;font-size:15px;font-weight:600;font-family:'Karla',sans-serif;}
 .nav > li > a:focus,.nav > li > a:hover {text-decoration:none;background-color:#f4f8fb;}
 .nav .open > a,.nav .open > a:focus,.nav .open > a:hover {border-color:#eeeeee;}
 /* List group */
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 928e0d33a..15136c58d 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -1,9 +1,6 @@
 /**
  * 公共
  */
-body {
-    font-family: arial,"Lantinghei SC","Microsoft Yahei";  
-}
 .none {display:none !important;}
 .block {display:block !important;}
 
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index d5eed8b51..8c494fa8b 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -16,6 +16,7 @@ time, mark, audio, video {
     border: 0;
     font: inherit;
     vertical-align: baseline;
+    font-family: arial,"Lantinghei SC","Microsoft Yahei";  
 }
 li { list-style-type: none; }
 button { outline: none; }