diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index 7417da351..4fb0d7de6 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -327,7 +327,7 @@ class Admin extends Common { $params = [ 'width' => 100, - 'height' => 26, + 'height' => 28, 'key_prefix' => 'admin_login', ]; $verify = new \base\Verify($params); diff --git a/application/api/controller/User.php b/application/api/controller/User.php index 71aeaafe6..966b227ab 100755 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -133,7 +133,7 @@ class User extends Common { $params = [ 'width' => 100, - 'height' => 26, + 'height' => 28, 'key_prefix' => input('type', 'user_reg'), ]; $verify = new \base\Verify($params); diff --git a/application/index/controller/User.php b/application/index/controller/User.php index 6de1cbd53..ff015ebaa 100755 --- a/application/index/controller/User.php +++ b/application/index/controller/User.php @@ -373,7 +373,7 @@ class User extends Common { $params = [ 'width' => 100, - 'height' => 26, + 'height' => 28, 'key_prefix' => input('type', 'user_reg'), ]; $verify = new \base\Verify($params); diff --git a/application/index/view/default/user/reg_info.html b/application/index/view/default/user/reg_info.html index ab1b6eac1..6841c84ba 100755 --- a/application/index/view/default/user/reg_info.html +++ b/application/index/view/default/user/reg_info.html @@ -29,193 +29,191 @@ {{/foreach}} {{/if}} -
-
-
- {{if !empty($home_user_login_type)}} - 我已经注册，现在就 - 登录 - {{/if}} +
+
+ {{if !empty($home_user_login_type)}} + 我已经注册，现在就 + 登录 + {{/if}} - - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} -
- plugins_view_user_reg_info -
- {{/if}} - {{if !empty($plugins_view_user_reg_info_data) and is_array($plugins_view_user_reg_info_data)}} - {{foreach $plugins_view_user_reg_info_data as $hook}} - {{if is_string($hook) or is_int($hook)}} - {{$hook|raw}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_user_reg_info +
+ {{/if}} + {{if !empty($plugins_view_user_reg_info_data) and is_array($plugins_view_user_reg_info_data)}} + {{foreach $plugins_view_user_reg_info_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} +
+ +
+ {{if !empty($home_user_reg_type)}} +
+
    + {{if in_array('username', $home_user_reg_type)}} +
  • 账号注册
    • {{/if}} - {{/foreach}} - {{/if}} -
+ {{if in_array('sms', $home_user_reg_type)}} +
  • 手机注册
    • + {{/if}} + {{if in_array('email', $home_user_reg_type)}} +
  • 邮箱注册
    • + {{/if}} + +
    + {{if in_array('username', $home_user_reg_type)}} +
    + +
    +
    + + +
    -
    - {{if !empty($home_user_reg_type)}} -
    -
      - {{if in_array('username', $home_user_reg_type)}} -
    • 账号注册
      • - {{/if}} - {{if in_array('sms', $home_user_reg_type)}} -
    • 手机注册
      • - {{/if}} - {{if in_array('email', $home_user_reg_type)}} -
    • 邮箱注册
      • - {{/if}} -
    -
    - {{if in_array('username', $home_user_reg_type)}} -
    - - -
    - - +
    + +
    + + + +
    +
    + {{if MyC('home_user_register_img_verify_state') eq 1}}
    - +
    - + - - -
    -
    - - {{if MyC('home_user_register_img_verify_state') eq 1}} -
    - -
    - - - - - 更换一张 - + + + 更换一张 -
    -
    - {{/if}} - - {{if MyC('home_is_enable_userregister_agreement') eq 1}} -
    - - 《服务协议》 -
    - {{/if}} - -
    - - -
    - - -
    - {{/if}} - {{if in_array('sms', $home_user_reg_type)}} -
    - -
    -
    - - -
    - -
    - -
    - - -
    + {{/if}} -
    - -
    - - - - -
    + {{if MyC('home_is_enable_userregister_agreement') eq 1}} +
    + + 《服务协议》
    + {{/if}} + +
    + + +
    + + +
    + {{/if}} + {{if in_array('sms', $home_user_reg_type)}} +
    + +
    +
    + + +
    - {{if MyC('home_is_enable_userregister_agreement') eq 1}} -
    - - 《服务协议》 -
    - {{/if}} - -
    - - -
    -
    - -
    - {{/if}} - {{if in_array('email', $home_user_reg_type)}} -
    - -
    -
    - - +
    + +
    + + + +
    +
    -
    - -
    - - - - -
    +
    + +
    + + + +
    +
    -
    - -
    - - - - -
    + {{if MyC('home_is_enable_userregister_agreement') eq 1}} +
    + + 《服务协议》
    + {{/if}} - {{if MyC('home_is_enable_userregister_agreement') eq 1}} -
    - - 《服务协议》 -
    - {{/if}} +
    + + +
    + + +
    + {{/if}} + {{if in_array('email', $home_user_reg_type)}} +
    + +
    +
    + + +
    -
    - - +
    + +
    + + + +
    - - -
    - {{/if}} -
    +
    + +
    + +
    + + + + +
    +
    + + {{if MyC('home_is_enable_userregister_agreement') eq 1}} +
    + + 《服务协议》 +
    + {{/if}} + +
    + + +
    + + +
    + {{/if}}
    - {{else /}} -
    暂时关闭了注册
    - {{/if}} -
    +
    + {{else /}} +
    暂时关闭了注册
    + {{/if}}
    diff --git a/public/static/admin/default/css/admin.logininfo.css b/public/static/admin/default/css/admin.logininfo.css index 63fb55237..298d94582 100755 --- a/public/static/admin/default/css/admin.logininfo.css +++ b/public/static/admin/default/css/admin.logininfo.css @@ -46,7 +46,7 @@ body { .wrapper-page { margin: auto; position: relative; - width: 420px; + max-width: 360px; } @media (max-width: 768px) { .wrapper-page { @@ -74,14 +74,14 @@ body { .admin-login .form-verify a.form-verify-tips { font-size: 12px; text-decoration: none; - line-height: 28px; + line-height: 30px; color: #FFF; filter: progid:DXImageTransform.Microsoft.gradient(enabled='true', startColorstr='#7F000000', endColorstr='#7F000000'); background: rgba(0,0,0,0.5); text-align: center; display: none; width: 102px; - height: 28px; + height: 30px; position: absolute; z-index: 1; top: -1px; diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 38db1bd9e..e3daa2a0a 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -64,7 +64,7 @@ input:hover, select:hover, textarea:hover, .chosen-choices:hover, .chosen-single .am-input-group-sm > .am-input-group-btn > .am-btn, .am-input-group-sm > .am-form-field, .am-input-group-sm > .am-input-group-label, -.am-input-group-sm > .am-input-group-btn > .am-btn { height: 28px; font-size: 12px !important; } +.am-input-group-sm > .am-input-group-btn > .am-btn { height: 30px; 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-alert-tips { background-color: #ffffe9; border-color: #faebd2; color: #888; } diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index 3609bfc45..d85a9f552 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -374,6 +374,9 @@ ul.plug-file-upload-view-file li { .am-checkbox .am-icon-checked, .am-radio .am-icon-checked, .am-checkbox-inline .am-icon-checked, .am-radio-inline .am-icon-checked, .am-checkbox .am-icon-checked, .am-radio .am-icon-checked, .am-checkbox-inline .am-icon-checked, .am-radio-inline .am-icon-checked, .am-checkbox .am-icon-unchecked, .am-radio .am-icon-unchecked, .am-checkbox-inline .am-icon-unchecked, .am-radio-inline .am-icon-unchecked { font-size: 16px; } +.am-btn { + padding: 0.6em 1em; +} /** * 颜色选择插件 @@ -812,7 +815,7 @@ button.colorpicker-submit img { @media only screen and (min-width: 641px) { #verify-img-value { float: left; - width: 50%; + width: 40%; margin-right: 5px; } } diff --git a/public/static/common/lib/amazeui-chosen/amazeui.chosen.css b/public/static/common/lib/amazeui-chosen/amazeui.chosen.css index 52028e3c1..3acbe0fb8 100755 --- a/public/static/common/lib/amazeui-chosen/amazeui.chosen.css +++ b/public/static/common/lib/amazeui-chosen/amazeui.chosen.css @@ -1 +1 @@ -.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:14px;zoom:1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.chosen-container .chosen-drop{position:absolute;top:100%;left:0;display:none;z-index:1010;width:100%;border:1px solid #bbb;border-top:0;background:#fff;-webkit-box-shadow:0 4px 5px rgba(0,0,0,.15);box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{display:block;}.chosen-container a{cursor:pointer}.chosen-container .search-choice .group-name,.chosen-container .chosen-single .group-name{margin-right:4px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-weight:400;color:#999}.chosen-container .search-choice .group-name:after,.chosen-container .chosen-single .group-name:after{content:":";padding-left:2px;vertical-align:top}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:0 0 0 8px;height:36px;border:1px solid #ddd;background-color:#fff;color:#444;text-decoration:none;white-space:nowrap;line-height:35px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:10px;right:26px;display:block;width:12px;height:12px;color:#999}.chosen-container-single .chosen-single abbr:before{position:absolute;left:0;top:0;display:inline-block;font-family:"FontAwesome",sans-serif;font-weight:400;font-style:normal;vertical-align:baseline;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:"\f00d"}.chosen-container-single .chosen-single abbr:hover{color:#666}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div:before{color:#999;content:"\f0d7";display:inline-block;font-family:"FontAwesome",sans-serif;font-weight:400;font-style:normal;vertical-align:baseline;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:5px;white-space:nowrap}.chosen-container-single .chosen-search:after{position:absolute;right:10px;top:15px;color:#aaa;display:inline-block;font-family:"FontAwesome",sans-serif;font-weight:400;font-style:normal;vertical-align:baseline;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:"\f002"}.chosen-container-single .chosen-search input[type="text"]{margin:1px 0;padding:5px 20px 5px 5px;width:100%;height:auto;outline:0;border:1px solid #ccc;font-size:1em;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;-webkit-background-clip:padding-box;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{color:#444;position:relative;overflow-x:hidden;overflow-y:auto;margin:0 4px 4px 0;padding:0 0 0 4px;max-height:240px;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px;word-wrap:break-word;-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{background-color:#0e90d2;color:#fff}.chosen-container .chosen-results li.no-results{color:#777;display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default;color:#777}.chosen-container .chosen-results li.group-option{padding-left:18px}.chosen-container .chosen-results li.group-option+.group-result{margin-top:10px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;margin:0;padding:3px 5px;width:100%;height:auto!important;height:1%;border:1px solid #ddd;background-color:#fff;cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type="text"]{margin:0;padding:0;height:25px;outline:0;border:0!important;background:transparent!important;-webkit-box-shadow:none;box-shadow:none;color:#999;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-choices li.search-choice{position:relative;margin:3px 3px 3px 0;padding:2px 13px 1px 2px;border:1px solid #ccc;max-width:100%;background-color:#f2f2f2;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);-webkit-box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);border-radius:1px;color:#333;line-height:16px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice span{word-wrap:break-word}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:2px;right:0px;display:block;width:12px;height:12px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{display:inline-block;font-family:"FontAwesome",sans-serif;font-weight:400;font-style:normal;vertical-align:baseline;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:"\f00d";color:#999}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover:before{color:#666}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;border:1px solid #ccc;background-color:#e4e4e4;color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #3bb4f2;-webkit-box-shadow:0 0 5px rgba(0,0,0,.3);box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #bbb;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:none;background:0 0}.chosen-container-active.chosen-with-drop .chosen-single div:before{content:"\f0d8"}.chosen-container-active .chosen-choices{border:1px solid #3bb4f2;-webkit-box-shadow:0 0 5px rgba(0,0,0,.3);box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type="text"]{color:#222!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-single,.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default} \ No newline at end of file +.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:14px;zoom:1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.chosen-container .chosen-drop{position:absolute;top:100%;left:0;display:none;z-index:1010;width:100%;border:1px solid #bbb;border-top:0;background:#fff;-webkit-box-shadow:0 4px 5px rgba(0,0,0,.15);box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{display:block;}.chosen-container a{cursor:pointer}.chosen-container .search-choice .group-name,.chosen-container .chosen-single .group-name{margin-right:4px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-weight:400;color:#999}.chosen-container .search-choice .group-name:after,.chosen-container .chosen-single .group-name:after{content:":";padding-left:2px;vertical-align:top}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:0 0 0 8px;height:36px;border:1px solid #ddd;background-color:#fff;color:#444;text-decoration:none;white-space:nowrap;line-height:35px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:10px;right:26px;display:block;width:12px;height:12px;color:#999}.chosen-container-single .chosen-single abbr:before{position:absolute;left:0;top:0;display:inline-block;font-family:"FontAwesome",sans-serif;font-weight:400;font-style:normal;vertical-align:baseline;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:"\f00d"}.chosen-container-single .chosen-single abbr:hover{color:#666}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div:before{color:#999;content:"\f0d7";display:inline-block;font-family:"FontAwesome",sans-serif;font-weight:400;font-style:normal;vertical-align:baseline;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:5px;white-space:nowrap}.chosen-container-single .chosen-search:after{position:absolute;right:10px;top:15px;color:#aaa;display:inline-block;font-family:"FontAwesome",sans-serif;font-weight:400;font-style:normal;vertical-align:baseline;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:"\f002"}.chosen-container-single .chosen-search input[type="text"]{margin:1px 0;padding:5px 20px 5px 5px;width:100%;height:auto;outline:0;border:1px solid #ccc;font-size:1em;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;-webkit-background-clip:padding-box;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{color:#444;position:relative;overflow-x:hidden;overflow-y:auto;margin:0 4px 4px 0;padding:0 0 0 4px;max-height:240px;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px;word-wrap:break-word;-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{background-color:#0e90d2;color:#fff}.chosen-container .chosen-results li.no-results{color:#777;display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default;color:#777}.chosen-container .chosen-results li.group-option{padding-left:18px}.chosen-container .chosen-results li.group-option+.group-result{margin-top:10px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;margin:0;padding:3px 5px;width:100%;height:auto!important;height:1%;border:1px solid #ddd;background-color:#fff;cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type="text"]{margin:0;padding:0;height:25px;outline:0;border:0!important;background:transparent!important;-webkit-box-shadow:none;box-shadow:none;color:#999;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-choices li.search-choice{position:relative;margin:5px 5px 5px 0;padding:2px 13px 1px 2px;border:1px solid #ccc;max-width:100%;background-color:#f2f2f2;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);-webkit-box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);border-radius:1px;color:#333;line-height:16px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice span{word-wrap:break-word}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:2px;right:0px;display:block;width:12px;height:12px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{display:inline-block;font-family:"FontAwesome",sans-serif;font-weight:400;font-style:normal;vertical-align:baseline;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:"\f00d";color:#999}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover:before{color:#666}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;border:1px solid #ccc;background-color:#e4e4e4;color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #3bb4f2;-webkit-box-shadow:0 0 5px rgba(0,0,0,.3);box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #bbb;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:none;background:0 0}.chosen-container-active.chosen-with-drop .chosen-single div:before{content:"\f0d8"}.chosen-container-active .chosen-choices{border:1px solid #3bb4f2;-webkit-box-shadow:0 0 5px rgba(0,0,0,.3);box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type="text"]{color:#222!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-single,.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default} \ No newline at end of file diff --git a/public/static/common/lib/ueditor/dialogs/map/map.html b/public/static/common/lib/ueditor/dialogs/map/map.html index 58f416bac..8a6259b1c 100755 --- a/public/static/common/lib/ueditor/dialogs/map/map.html +++ b/public/static/common/lib/ueditor/dialogs/map/map.html @@ -4,7 +4,7 @@ - + - + diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index be5b97921..286360c9e 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -29,7 +29,7 @@ button { outline: none; } .am-input-group-sm > .am-form-field, .am-input-group-sm > .am-input-group-label, .am-input-group-sm > .am-input-group-btn > .am-btn { - height: 28px; + height: 30px; font-size: 12px !important; } .am-input-group-sm > .am-input-group-label { diff --git a/public/static/index/default/css/orderaftersale.detail.css b/public/static/index/default/css/orderaftersale.detail.css index 97435e7f9..9570b1ca6 100644 --- a/public/static/index/default/css/orderaftersale.detail.css +++ b/public/static/index/default/css/orderaftersale.detail.css @@ -100,7 +100,7 @@ } .aftersale-step li.selected i.am-icon-caret-right { position: absolute; - top: -29px; + top: -31px; right: 5px; z-index: 1; font-size: 56px; diff --git a/public/static/index/default/css/safety.css b/public/static/index/default/css/safety.css index 46558e5db..45db8060a 100755 --- a/public/static/index/default/css/safety.css +++ b/public/static/index/default/css/safety.css @@ -11,7 +11,7 @@ .user-content-body #verify-win .am-modal-bd { margin-top: 10px; } .user-content-body #verify-win .am-modal-bd .base { overflow: hidden; } .user-content-body #verify-win .am-modal-bd .base .verify-tips { font-size: 12px; } -.user-content-body #verify-img { vertical-align: middle; } +.user-content-body #verify-img { vertical-align: middle; border: 1px solid #ccc; } .user-content-body legend { padding-bottom: 0.2rem; diff --git a/public/static/index/default/css/user.css b/public/static/index/default/css/user.css index 66952f9b3..e77665adb 100755 --- a/public/static/index/default/css/user.css +++ b/public/static/index/default/css/user.css @@ -35,11 +35,17 @@ .my-content { padding: 20px 0 30px 0; } + .user-login-container .container-right { + padding: 0 15%; + } } /** * 表单 */ +.register-container { + max-width: 380px; +} .user-form-container, .register-container .register-content { background: rgba(0,0,0,0.15); padding: 10px; @@ -63,14 +69,14 @@ .my-content form.am-form .form-verify a.form-verify-tips { font-size: 12px; text-decoration: none; - line-height: 28px; + line-height: 30px; color: #FFF; filter: progid:DXImageTransform.Microsoft.gradient(enabled='true', startColorstr='#7F000000', endColorstr='#7F000000'); background: rgba(0,0,0,0.5); text-align: center; display: none; width: 102px; - height: 28px; + height: 30px; position: absolute; z-index: 1; top: -1px;