diff --git a/application/admin/view/default/site/login.html b/application/admin/view/default/site/login.html
index 2ec95d01c60448a12fbe95f205cc8444bce2b6d0..657bd4a8a5011d9a6190b96caa0c54311ae3e6fd 100644
--- a/application/admin/view/default/site/login.html
+++ b/application/admin/view/default/site/login.html
@@ -8,7 +8,7 @@
         <!-- table nav end -->
 
         <!-- form start -->
-        <form class="am-form form-validation view-save site-panel" action="{{:MyUrl('admin/site/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/site/index', ['nav_type'=>'login'])}}" enctype="multipart/form-data">
+        <form class="am-form form-validation view-save" action="{{:MyUrl('admin/site/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/site/index', ['nav_type'=>'login'])}}" enctype="multipart/form-data">
             <!-- 图片1 -->
             <div class="am-panel am-panel-default">
                 <div class="am-panel-hd">
diff --git a/application/index/view/default/user/reg_info.html b/application/index/view/default/user/reg_info.html
index 60a6a2704590aac40f50ea9c8757adbc7ccdf5f8..eeb66b5e5da9f32aa52bb2fb4847ad96c90c8553 100755
--- a/application/index/view/default/user/reg_info.html
+++ b/application/index/view/default/user/reg_info.html
@@ -102,7 +102,7 @@
                                             {{/if}}
 
                                             {{if MyC('home_is_enable_userregister_agreement') eq 1}}
-                                                <div class="agreement">
+                                                <div class="agreement am-padding-horizontal-sm">
                                                     <label class="am-checkbox am-success c-p">
                                                         <input type="checkbox" value="1" name="is_agree_agreement" data-validation-message="请同意注册协议" data-am-ucheck required /> 阅读并同意
                                                     </label>
@@ -148,7 +148,7 @@
                                             </div>
 
                                             {{if MyC('home_is_enable_userregister_agreement') eq 1}}
-                                                <div class="agreement">
+                                                <div class="agreement am-padding-horizontal-sm">
                                                     <label class="am-checkbox am-success c-p">
                                                         <input type="checkbox" value="1" name="is_agree_agreement" data-validation-message="请同意注册协议" data-am-ucheck required /> 阅读并同意
                                                     </label>
@@ -194,7 +194,7 @@
                                             </div>
 
                                             {{if MyC('home_is_enable_userregister_agreement') eq 1}}
-                                                <div class="agreement">
+                                                <div class="agreement am-padding-horizontal-sm">
                                                     <label class="am-checkbox am-success c-p">
                                                         <input type="checkbox" value="1" name="is_agree_agreement" data-validation-message="请同意注册协议" data-am-ucheck required /> 阅读并同意
                                                     </label>
diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css
index dfb8f7709c7ebbf38cedd3a64c3d13fcea515dc3..f92200461b07468ae9a0382e456f08496bbab86f 100755
--- a/public/static/admin/default/css/common.css
+++ b/public/static/admin/default/css/common.css
@@ -69,7 +69,6 @@ input:hover, select:hover, textarea:hover, .chosen-choices:hover, .chosen-single
 .am-input-group-sm > .am-input-group-btn > .am-btn { height: 28px; font-size: 12px !important; }
 .left-menu-more-ico-rotate {-webkit-transform: rotate(-90deg);transform: rotate(-90deg);-webkit-transition: all 300ms;transition: all 300ms;}
 .am-icon-angle-down {-webkit-transition: all 300ms;transition: all 300ms;}
-.am-radio-inline input[type="radio"] { margin-left: 0px !important; }
 .am-alert-tips { background-color: #ffffe9; border-color: #faebd2; color: #888; }
 .am-alert-tips, .am-alert-tips * { font-size: 12px; }
 .am-btn-sm { font-size: 12px; }
diff --git a/public/static/admin/default/css/site.css b/public/static/admin/default/css/site.css
index 1ffb4f21ed14ff1ab33a47d8d85f89e2812c9bfb..8137c2950135fe76334eaa5d60598da53dce9977 100755
--- a/public/static/admin/default/css/site.css
+++ b/public/static/admin/default/css/site.css
@@ -18,10 +18,10 @@ ul.home_site_user_register_bg_images-images-view li {
 /**
  * 带面板
  */
-.site-panel .am-panel .am-panel-bd .am-form-group {
+.content-right .am-panel .am-panel-bd .am-form-group {
     margin-bottom: 10px;
 }
-.site-panel .am-panel .am-panel-bd .am-form-group {
+.content-right .am-panel .am-panel-bd .am-form-group {
     border-bottom: 0;
     margin-bottom: 0;
 }
\ No newline at end of file
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 4af8b250e19acc290f2ead485987fe37ebe8d9b1..8ce65c6077259fc79882d8fd26891af46088eb66 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -369,3 +369,10 @@ button.colorpicker-submit img {
     }
 }
 
+
+/**
+ * 框架组件代码优化
+ */
+.am-radio input[type="radio"], .am-radio-inline input[type="radio"], .am-checkbox input[type="checkbox"], .am-checkbox-inline input[type="checkbox"] {
+    margin: -3px;
+}
\ No newline at end of file
diff --git a/public/static/common/lib/colorpicker/jquery.colorpicker.js b/public/static/common/lib/colorpicker/jquery.colorpicker.js
index 22f4c48ff6a6d6c08d34c1561f5510a5608d12c8..45dce328c5a3b8644b2219ffb6e05a43bd7f40f9 100755
--- a/public/static/common/lib/colorpicker/jquery.colorpicker.js
+++ b/public/static/common/lib/colorpicker/jquery.colorpicker.js
@@ -82,8 +82,8 @@
                     }
                 }
             }
-            colorTable='<table width=232 border="0" cellspacing="0" cellpadding="0" style="border:1px solid #000;">'
-            +'<tr height=30><td colspan=21 bgcolor=#cccccc>'
+            colorTable='<table width=232 border="0" cellspacing="0" cellpadding="0" style="border:1px solid #000;height: 24px;line-height: 21px;">'
+            +'<tr><td colspan=21 bgcolor=#cccccc>'
             +'<table cellpadding="0" cellspacing="1" border="0" style="border-collapse: collapse">'
             +'<tr><td width="3"><td><input type="text" id="DisColor" size="3" disabled style="border:solid 1px #000000;background-color:#ffff00"></td>'
             +'<td width="3"><td><input type="text" id="HexColor" size="7" style="border:inset 1px;font-family:Arial;" value="#000000"><a href="javascript:void(0);" id="_determine">确定</a> | <a href="javascript:void(0);" id="_cclose">关闭</a> | <a href="javascript:void(0);" id="_creset">清除</a></td></tr></table></td></table>'