diff --git a/admin/css/other/result.css b/admin/css/other/result.css index ce58214..d5ccaa3 100644 --- a/admin/css/other/result.css +++ b/admin/css/other/result.css @@ -2,33 +2,28 @@ text-align: center; } - .result .success svg { color: #32C682; text-align: center; margin-top: 40px; } - .result .error svg { color: #f56c6c; text-align: center; margin-top: 40px; } - .result .title { margin-top: 25px; } - .result .desc { margin-top: 25px; width: 60%; margin-left: 20%; color: rgba(0, 0, 0, .45); } - .result .content { margin-top: 20px; width: 80%; @@ -37,10 +32,8 @@ height: 200px; margin-left: 10%; } - .result .action { padding-top: 10px; border-top: 1px whitesmoke solid; margin-top: 25px; - } diff --git a/admin/data/menu.json b/admin/data/menu.json index 1c337a9..d82e6c8 100644 --- a/admin/data/menu.json +++ b/admin/data/menu.json @@ -175,6 +175,13 @@ "type": 1, "openType": "_iframe", "href": "view/document/tab.html" + },{ + "id": 60132, + "title": "数据菜单", + "icon": "layui-icon layui-icon-face-cry", + "type": 1, + "openType": "_iframe", + "href": "view/document/menu.html" }] }, { "id": 204, diff --git a/component/pear/css/pear-module/button.css b/component/pear/css/pear-module/button.css index 7c2ccfc..3163394 100644 --- a/component/pear/css/pear-module/button.css +++ b/component/pear/css/pear-module/button.css @@ -44,51 +44,14 @@ background-color: #f56c6c !important } .pear-btn-warming { - background-color: #e6a23c !important + background-color: #f6ad55 !important } .pear-btn-success { - background-color: #67c23a !important + background-color: #5FB878 !important } .pear-btn[round] { border-radius: 50px; } -.pear-btn-primary[plain] { - color: #409eff !important; - background: #ecf5ff !important; - border-color: #b3d8ff !important; -} -.pear-btn-primary[plain]:hover { - color: #fff !important; - background-color: #2d8cf0 !important -} -.pear-btn-success[plain] { - color: #67c23a !important; - background: #f0f9eb !important; - border-color: #c2e7b0 !important; -} -.pear-btn-success[plain]:hover { - color: white !important; - background-color: #67c23a !important -} -.pear-btn-warming[plain] { - color: #e6a23c !important; - background: #fdf6ec !important; - border-color: #f5dab1 !important; -} -.pear-btn-warming[plain]:hover { - color: white !important; - background-color: #e6a23c !important -} -.pear-btn-danger[plain] { - color: #f56c6c !important; - background: #fef0f0 !important; - border-color: #fbc4c4 !important; -} -.pear-btn-danger[plain]:hover { - color: white !important; - background-color: #f56c6c !important -} - /** Button Group */ .pear-btn-group { display: inline-block; diff --git a/component/pear/css/pear-module/form.css b/component/pear/css/pear-module/form.css index 6b31ed8..c82f1e0 100644 --- a/component/pear/css/pear-module/form.css +++ b/component/pear/css/pear-module/form.css @@ -12,19 +12,6 @@ textarea::-webkit-input-placeholder { .layui-input:focus, .layui-textarea:focus { border-color: #5FB878!important; - box-shadow: 0 0 0 3px rgba(95, 184, 120, 0.2)!important; -} - -.layui-input[success], -.layui-textarea[success] { - border-color: #5FB878!important; - box-shadow: 0 0 0 3px rgba(95, 184, 120, 0.2)!important; -} - -.layui-input[failure], -.layui-textarea[failure] { - border-color: #f56c6c !important; - box-shadow: 0 0 0 3px rgba(245,108,108, 0.2)!important; } .layui-input, diff --git a/component/pear/css/pear-module/select.css b/component/pear/css/pear-module/select.css index 0706cff..22a17d2 100644 --- a/component/pear/css/pear-module/select.css +++ b/component/pear/css/pear-module/select.css @@ -439,27 +439,27 @@ div[xm-select-skin=default].xm-form-selected .xm-select:hover { } div[xm-select-skin=primary] .xm-select-title div.xm-select-label>span { - background-color: #67c23a!important + background-color: #5FB878!important color: #FFF; - border: 1px solid #67c23a!important + border: 1px solid #5FB878!important } div[xm-select-skin=primary] .xm-select-title div.xm-select-label>span i { - background-color: #67c23a!important + background-color: #5FB878!important color: #FFF } div[xm-select-skin=primary] dl dd:not(.xm-dis-disabled) i { - border-color: #67c23a!important + border-color: #5FB878!important } div[xm-select-skin=primary] dl dd.xm-select-this:not(.xm-dis-disabled) i { - color: #67c23a!important + color: #5FB878!important } div[xm-select-skin=primary].xm-form-selected .xm-select, div[xm-select-skin=primary].xm-form-selected .xm-select:hover { - border-color: #67c23a!important + border-color: #5FB878!important } div[xm-select-skin=normal] .xm-select-title div.xm-select-label>span { diff --git a/component/pear/css/pear-module/step.css b/component/pear/css/pear-module/step.css index 379af9c..6394662 100644 --- a/component/pear/css/pear-module/step.css +++ b/component/pear/css/pear-module/step.css @@ -26,7 +26,7 @@ .step-item-tail i { display: inline-block; width: 100%; - height: 2px; + height: 3px; margin-top: 4px; vertical-align: top; background: #5FB878; @@ -47,7 +47,7 @@ text-align: center; vertical-align: top; color: #5FB878; - border: 2px solid #5FB878; + border: 3px solid #5FB878; border-radius: 50%; background: #ffffff; } diff --git a/component/pear/css/pear-module/tag.css b/component/pear/css/pear-module/tag.css index 0a8fac2..7c244bc 100644 --- a/component/pear/css/pear-module/tag.css +++ b/component/pear/css/pear-module/tag.css @@ -10,7 +10,6 @@ .tag .layui-btn .tag-close:hover { border-radius: 2px; - background-color: #FF5722; color: #fff; } @@ -20,7 +19,7 @@ -webkit-transition: all .2s; } .tag-item { - background-color: #67c23a; + background-color: #5FB878; color: white; border: none; } @@ -31,13 +30,13 @@ } .tag-item-normal { - background-color: #2D8CF0; + background-color: #5FB878; color: white; border: none; } .tag-item-warm { - background-color: #e6a23c; + background-color: #f6ad55; color: white; border: none; } diff --git a/component/pear/modules/theme.js b/component/pear/modules/theme.js index 8cef4dd..4dccfc4 100644 --- a/component/pear/modules/theme.js +++ b/component/pear/modules/theme.js @@ -40,13 +40,13 @@ layui.define(["jquery","layer"], function (exports) { if(this.autoHead){ style += '.pear-admin .layui-header{background-color:' + color + '!important;}.pear-admin .layui-header .layui-nav .layui-nav-item>a{color:white!important;}'; } - style += '.pear-btn.pear-btn-primary {background-color:' + color + '!important}'; - style += '.layui-input:focus,.layui-textarea:focus {border-color: '+ color +'!important;box-shadow: 0 0 0 3px rgba(95, 184, 120, 0.2)!important;}' + style += '.pear-btn-primary {background-color:' + color + '!important}'; + style += '.layui-input:focus,.layui-textarea:focus {border-color: '+ color +'!important;}' style += '.layui-form-checked[lay-skin=primary] i {border-color: '+ color +'!important;background-color: ' + color + ';}' style += '.layui-form-onswitch { border-color: ' + color + '; background-color: '+color+';}' style += '.layui-form-radio>i:hover, .layui-form-radioed>i {color: ' + color + ';}' style += '.layui-laypage .layui-laypage-curr .layui-laypage-em{background-color:'+ color +'!important}' - style += '.layui-tab-brief>.layui-tab-more li.layui-this:after, .layui-tab-brief>.layui-tab-title .layui-this:after{border-bottom: 2px solid '+color+'!important}' + style += '.layui-tab-brief>.layui-tab-more li.layui-this:after, .layui-tab-brief>.layui-tab-title .layui-this:after{border-bottom: 3px solid '+color+'!important}' style += '.layui-tab-brief>.layui-tab-title .layui-this{color:'+color+'!important}' style += '.layui-progress-bar{background-color:'+color+'}'; style += '.layui-elem-quote{border-left: 5px solid '+ color +'}'; @@ -55,6 +55,12 @@ layui.define(["jquery","layer"], function (exports) { style += '.pear-text{color:' + color + '!important}'; style += '.pear-collasped-pe{background-color:'+color+'!important}' style += '.layui-form-select dl dd.layui-this{background-color:'+color+'}' + style += '.tag-item-normal{background:'+color+'!important}'; + style += '.step-item-head.step-item-head-active{background-color:'+color+'}' + style += '.step-item-head{border: 3px solid '+color+';}' + style += '.step-item-tail i{background-color:'+color+'}' + style += '.step-item-head{color:' + color + '}' + var colorPane = $("#pear-admin-color"); if(colorPane.length>0){ colorPane.html(style); diff --git a/component/pear/pear.all.js b/component/pear/pear.all.js index 961353e..61409bc 100644 --- a/component/pear/pear.all.js +++ b/component/pear/pear.all.js @@ -11,7 +11,7 @@ window.rootPath = (function(src) { * */ layui.config({ base: rootPath + "modules/", - version: "3.4.2.Release" + version: "3.4.3.Release" }).extend({ admin: "admin", // 框架布局组件 menu: "menu", // 数据菜单组件 diff --git a/component/pear/pear.js b/component/pear/pear.js index 961353e..61409bc 100644 --- a/component/pear/pear.js +++ b/component/pear/pear.js @@ -11,7 +11,7 @@ window.rootPath = (function(src) { * */ layui.config({ base: rootPath + "modules/", - version: "3.4.2.Release" + version: "3.4.3.Release" }).extend({ admin: "admin", // 框架布局组件 menu: "menu", // 数据菜单组件 diff --git a/view/console/console1.html b/view/console/console1.html index 5a99487..dbd1f65 100644 --- a/view/console/console1.html +++ b/view/console/console1.html @@ -164,7 +164,7 @@
-

七彩枫叶 在 Pear Admin 专区 回答问题

+

七彩枫叶 在 Pear Admin 专区 回答问题

几秒前
@@ -172,7 +172,7 @@
-

简 在 Pear Admin 专区 进行了 提问

+

简 在 Pear Admin 专区 进行了 提问

2天前
@@ -180,7 +180,7 @@
-

恒宇少年 将 Pear Admin 更新至 2.3.0 版本

+

恒宇少年 将 Pear Admin 更新至 2.3.0 版本

7天前
@@ -188,7 +188,7 @@
-

如花 在 Pear Admin 社区 发布了 建议

+

如花 在 Pear Admin 社区 发布了 建议

7天前
@@ -196,7 +196,7 @@
-

就眠仪式 在 Pear Admin 社区 发布了 建议

+

就眠仪式 在 Pear Admin 社区 发布了 建议

8天前
@@ -204,7 +204,7 @@
-

贤心 在 Pear Admin 专区 进行了 提问

+

贤心 在 Pear Admin 专区 进行了 提问

8天前
@@ -233,11 +233,11 @@ 链接
- 官 网 -
- 文 档 + 官 网
下 载 +
+ 后 端
diff --git a/view/document/button.html b/view/document/button.html index 0b9eae3..4c47f63 100644 --- a/view/document/button.html +++ b/view/document/button.html @@ -138,37 +138,6 @@ -
-
-
- 扩展进阶 -
-
- - - -
-
- - - -
-
-
-
-
-
-

显示代码

-
- 
-								
-								
-								
-
-
-
-
-
diff --git a/view/document/menu.html b/view/document/menu.html new file mode 100644 index 0000000..a0dcaf8 --- /dev/null +++ b/view/document/menu.html @@ -0,0 +1,109 @@ + + + + + + + + +
+
+
+
开发环境
+
+ Menu 数据菜单对侧边菜单的便捷封装 +
+
+
+
+
+
+

显示代码

+
+ 
+								
+								 并
+								
+								 并
+								
+
+
+
+
+
+
+
+
实例
+
+
+
+
+
+
+
+
+

显示代码

+
+ 
+								
+								var sideMenu = menu.render({
+									elem: 'sideMenu',
+									async: true,
+									theme: "dark-theme",
+									height: '300px',
+									control: false, 
+									defaultMenu: 0,
+									accordion: true,
+									url: "../../admin/data/menu.json",
+									parseData: false,
+									done: function() {
+										layer.msg("加载完成")
+									}
+								});
+								
+								sideMenu.click(function(dom, data) {
+									layer.msg("菜单点击 : " + JSON.stringify(data));
+								})
+								
+								
+
+
+
+
+
+
+ + + + +