diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 9e7212ce3da4b2c06d081795086eeac462e3dbf1..9a2791d796cfd6418a4423087e1fb673a10a0d16 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 {font-family:'Karla',sans-serif;margin:10px 0;} +h1,h2,h3,h4,h5,h6 {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;font-family:'Karla',sans-serif;} +.nav-tabs a {color:#435966;font-size:15px;font-weight:600;} .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 15136c58d8a782818977c246edaf94085c2a568d..928e0d33a7cc3ff3dce41bc404fd033ae2d56839 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -1,6 +1,9 @@ /** * 公共 */ +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 8c494fa8b9f915c3a3258614eecdfda7663a26be..d5eed8b51ee2d867a4a541cb7a1aa3ffde1d0ca2 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -16,7 +16,6 @@ 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; }