From c8c70f0787438a8915226e67e9909f9deafbf2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 17 Feb 2017 10:23:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9layui=E4=B8=8Ebootstrap?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/config.index.html    | 20 ++++++++++----------
 application/admin/view/index.main.html      |  4 ++--
 public/static/theme/default/css/console.css |  3 ---
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/application/admin/view/config.index.html b/application/admin/view/config.index.html
index 3ccbc8508..c31756dbb 100644
--- a/application/admin/view/config.index.html
+++ b/application/admin/view/config.index.html
@@ -8,7 +8,7 @@
         <form class=" layui-form" data-auto="" method="post" style="padding-right:20px;">
             <div class="row">
                 <div class="col-lg-6">
-                    <div class="layui-form-item layui">
+                    <div class="layui-form-item layui-box">
                         <label class="layui-form-label">网站名称</label>
                         <div class="layui-input-block">
                             <input type="text"
@@ -21,7 +21,7 @@
                                    class="layui-input">
                         </div>
                     </div>
-                    <div class="layui-form-item layui">
+                    <div class="layui-form-item layui-box">
                         <label class="layui-form-label">网站域名</label>
                         <div class="layui-input-block">
                             <input type="text"
@@ -34,7 +34,7 @@
                                    class="layui-input">
                         </div>
                     </div>
-                    <div class="layui-form-item layui">
+                    <div class="layui-form-item layui-box">
                         <label class="layui-form-label">公司名称</label>
                         <div class="layui-input-block">
                             <input type="text"
@@ -47,7 +47,7 @@
                                    class="layui-input">
                         </div>
                     </div>
-                    <div class="layui-form-item layui">
+                    <div class="layui-form-item layui-box">
                         <label class="layui-form-label">百度统计ID</label>
                         <div class="layui-input-block">
                             <input type="text"
@@ -62,7 +62,7 @@
                             帮助统计网页访问情况，可以去<a target="_blank" href="http://tongji.baidu.com">百度统计</a>获取ID。
                         </div>
                     </div>
-                    <div class="layui-form-item layui">
+                    <div class="layui-form-item layui-box">
                         <label class="layui-form-label">CNZZ统计ID</label>
                         <div class="layui-input-block">
                             <input type="text"
@@ -78,7 +78,7 @@
                     </div>
                 </div>
                 <div class="col-lg-6">
-                    <div class="layui-form-item layui">
+                    <div class="layui-form-item layui-box">
                         <label class="layui-form-label">后台标题</label>
                         <div class="layui-input-block">
                             <input type="text"
@@ -91,7 +91,7 @@
                                    class="layui-input">
                         </div>
                     </div>
-                    <div class="layui-form-item layui">
+                    <div class="layui-form-item layui-box">
                         <label class="layui-form-label">系统版本</label>
                         <div class="layui-input-block">
                             <input type="text"
@@ -104,7 +104,7 @@
                                    class="layui-input">
                         </div>
                     </div>
-                    <div class="layui-form-item layui">
+                    <div class="layui-form-item layui-box">
                         <label class="layui-form-label">网站Logo</label>
                         <div class="layui-input-block">
                             <img data-tips-image="" style="height:auto;max-height:32px;min-width:32px"
@@ -122,7 +122,7 @@
                             建议LOGO图片的尺寸为160x56px，此LOGO图片用于后台登陆页面。
                         </div>
                     </div>
-                    <div class="layui-form-item layui">
+                    <div class="layui-form-item layui-box">
                         <label class="layui-form-label">浏览器图标</label>
                         <div class="layui-input-block">
                             <img data-tips-image="" style="height:auto;max-height:32px;min-width:32px"
@@ -142,7 +142,7 @@
                 </div>
             </div>
 
-            <div class="layui-form-item layui">
+            <div class="layui-form-item layui-box">
                 <div class="layui-input-block text-center">
                     <button class="layui-btn" type="submit">立即提交</button>
                 </div>
diff --git a/application/admin/view/index.main.html b/application/admin/view/index.main.html
index ddcf373bf..3b63df9b1 100644
--- a/application/admin/view/index.main.html
+++ b/application/admin/view/index.main.html
@@ -3,7 +3,7 @@
 {block name="content"}
 <div class="row">
     <div class="col-lg-6">
-        <table class="layui layui-table" lay-even lay-skin="line">
+        <table class="layui-box layui-table" lay-even lay-skin="line">
             <colgroup>
                 <col width="40%">
                 <col>
@@ -50,7 +50,7 @@
         </table>
     </div>
     <div class="col-lg-6">
-        <table class="layui layui-table" lay-even lay-skin="line">
+        <table class="layui-box layui-table" lay-even lay-skin="line">
             <colgroup>
                 <col width="40%">
                 <col>
diff --git a/public/static/theme/default/css/console.css b/public/static/theme/default/css/console.css
index 05939735c..4e9908905 100644
--- a/public/static/theme/default/css/console.css
+++ b/public/static/theme/default/css/console.css
@@ -117,9 +117,6 @@ input::-ms-clear {display:none}
 ::selection {background-color:#ec494e;color:#FFF}
 ::-moz-selection {background-color:#ec494e;color:#FFF}
 
-/* layui 兼容处理 */
-.layui, .layui * {-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}
-
 /** checkbox 优化 */
 input[type=checkbox],input[type=radio] {-webkit-appearance:none;appearance:none;width:18px;height:18px;margin:0;cursor:pointer;vertical-align:bottom;background:#fff;border:1px solid #dcdcdc;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative}
 input[type=checkbox]:active,input[type=radio]:active {border-color:#c6c6c6;background:#ebebeb}