diff --git a/admin/css/other/login.css b/admin/css/other/login.css index 2bc1727..56e7d3c 100644 --- a/admin/css/other/login.css +++ b/admin/css/other/login.css @@ -1,39 +1,39 @@ .layui-form { - width: 330px!important; - margin: auto!important; - margin-top: 160px!important; + width: 320px !important; + margin: auto !important; + margin-top: 160px !important; } .layui-form button { - width: 100%!important; - height: 44px!important; - line-height: 44px!important; - font-size: 16px!important; - background-color: #5FB878!important; - font-weight: 550!important; + width: 100% !important; + height: 44px !important; + line-height: 44px !important; + font-size: 16px !important; + background-color: #5FB878 !important; + font-weight: 550 !important; } .layui-form-checked[lay-skin=primary] i { border-color: #5FB878 !important; - background-color: #5FB878!important; - color: #fff!important; + background-color: #5FB878 !important; + color: #fff !important; } .layui-tab-content { - margin-top: 15px!important; - padding-left: 0px!important; - padding-right: 0px!important; + margin-top: 15px !important; + padding-left: 0px !important; + padding-right: 0px !important; } .layui-form-item { - margin-top: 20px!important; + margin-top: 20px !important; } .layui-input { - height: 44px!important; - line-height: 44px!important; - padding-left: 15px!important; - border-radius: 3px!important; + height: 44px !important; + line-height: 44px !important; + padding-left: 15px !important; + border-radius: 3px !important; } .layui-input:focus { @@ -41,33 +41,43 @@ } .logo { - width: 60px!important; - margin-top: 10px!important; - margin-bottom: 10px!important; - margin-left: 20px!important; + width: 60px !important; + margin-top: 10px !important; + margin-bottom: 10px !important; + margin-left: 20px !important; } .title { - font-size: 30px!important; - font-weight: 550!important; - margin-left: 20px!important; + font-size: 30px !important; + font-weight: 550 !important; + margin-left: 20px !important; color: #5FB878 !important; - display: inline-block!important; - height: 60px!important; - line-height: 60px!important; - margin-top: 10px!important; - position: absolute!important; + display: inline-block !important; + height: 60px !important; + line-height: 60px !important; + margin-top: 10px !important; + position: absolute !important; } .desc { - width: 100%!important; - text-align: center!important; - color: gray!important; - height: 60px!important; - line-height: 60px!important; + width: 100% !important; + text-align: center !important; + color: gray !important; + height: 60px !important; + line-height: 60px !important; } body { background-color: whitesmoke; height: 100%; } + +.code { + margin-right: 13px; + border: #e6e6e6 1px solid; +} + +.codeImage { + height: 42px; + border: #e6e6e6 1px solid; +} diff --git a/admin/data/menu.json b/admin/data/menu.json index b4de64e..8f0afac 100644 --- a/admin/data/menu.json +++ b/admin/data/menu.json @@ -23,7 +23,7 @@ "title": "百度一下", "icon": "layui-icon layui-icon-console", "type": 1, - "openType": "_blank", + "openType": "_iframe", "href": "http://www.baidu.com" }] }, diff --git a/admin/images/avatar.jpg b/admin/images/avatar.jpg index 529efb1..b0ae8d9 100644 Binary files a/admin/images/avatar.jpg and b/admin/images/avatar.jpg differ diff --git a/admin/images/captcha.gif b/admin/images/captcha.gif new file mode 100644 index 0000000..2273bd4 Binary files /dev/null and b/admin/images/captcha.gif differ diff --git a/component/pear/css/pear-module/select.css b/component/pear/css/pear-module/select.css index f37e583..0706cff 100644 --- a/component/pear/css/pear-module/select.css +++ b/component/pear/css/pear-module/select.css @@ -820,3 +820,8 @@ div[xm-select-search-type="1"] .xm-select .xm-select-input { .icon-expand:before { content: "\e641"; } + +.xm-select-parent .xm-form-select dl{ + position: relative; + top: 5px!important; +} diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js index 95524c4..a046db0 100644 --- a/component/pear/module/admin.js +++ b/component/pear/module/admin.js @@ -209,9 +209,9 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'], if ($("iframe").contents().find("#customTheme").length > 0) { $("iframe").contents().find("#customTheme").remove(); } - var theme = "'; - $("iframe").contents().find("head").append(theme); + $("iframe").contents().find("head").append(theme); */ $("#pearadmin-bg-color").html(style); } }; diff --git a/login.html b/login.html index fc2dc2a..8bab37c 100644 --- a/login.html +++ b/login.html @@ -22,6 +22,10 @@
+