diff --git a/admin/css/pearAdmin.css b/admin/css/pearAdmin.css index 742d83f..1c0a667 100644 --- a/admin/css/pearAdmin.css +++ b/admin/css/pearAdmin.css @@ -20,12 +20,15 @@ .pear-admin .layui-side { transition: all .3s; } + .pear-admin .layui-logo .title { font-size: 20px; } + .layui-header .layui-nav-more { display: none !important; } + .pe-collaspe { position: absolute; width: 50px; @@ -46,15 +49,18 @@ background-color: white !important; color: black !important; } + .light-theme .layui-side-scroll { background-color: white !important; color: black !important; } + .light-theme .bottom-nav { background-color: white !important; box-shadow: none; border-top: whitesmoke 1px solid; } + .light-theme .bottom-nav * { color: dimgray; } @@ -66,14 +72,17 @@ background-color: white; border-bottom: 1px solid whitesmoke; } + .pear-admin .layui-header .layui-nav-img { width: 30px; height: 30px; } + .pear-admin .layui-layout-control { left: 120px; position: absolute; } + .pear-admin .layui-logo { width: 220px; height: 60px; @@ -81,10 +90,12 @@ background-color: #28333E; } + .pear-admin .layui-logo img { width: 36px; height: 36px; } + .pear-admin .layui-logo .title { font-size: 21px; font-weight: 550; @@ -93,38 +104,48 @@ top: 5px; margin-left: 5px; } + .pear-admin .layui-logo .logo { display: none; } + .pear-mini .layui-logo .title { display: none; } + .pear-mini .layui-logo .logo { display: inline-block; } + + .pear-admin .layui-side { top: 0px; width: 220px; box-shadow: 2px 0 6px rgba(0, 21, 41, .35); z-index: 9999; } + .pear-admin .layui-side-scroll::-webkit-scrollbar { width: 0px; height: 0px; } + .pear-admin .layui-side-scroll { height: calc(100% - 60px); background-color: #28333E; } + .pear-admin .layui-header .layui-nav .layui-nav-item>a { color: black; font-size: 15px; } + .pear-admin .layui-body { left: 220px; bottom: 0px; } + .pear-admin .layui-layout-left { left: 0px; diff --git a/admin/css/pearCommon.css b/admin/css/pearCommon.css index 9277598..d2d0c87 100644 --- a/admin/css/pearCommon.css +++ b/admin/css/pearCommon.css @@ -107,10 +107,64 @@ body::-webkit-scrollbar-corner { background: #f6f6f6; } +.mainBox::-webkit-scrollbar { + width: 0px; + height: 0px; +} + +.mainBox::-webkit-scrollbar { + width: 6px; + height: 6px; +} + +.mainBox::-webkit-scrollbar-track { + background: white; + border-radius: 2px; +} + +.mainBox::-webkit-scrollbar-thumb { + background: #E6E6E6; + border-radius: 2px; +} + +.mainBox::-webkit-scrollbar-thumb:hover { + background: #E6E6E6; +} +.mainBox::-webkit-scrollbar-corner { + background: #f6f6f6; +} + .pear-btn i{ font-size: 13px; } +.layui-table-body::-webkit-scrollbar { + width: 0px; + height: 0px; +} + +.layui-table-body::-webkit-scrollbar { + width: 6px; + height: 6px; +} +.layui-table-body::-webkit-scrollbar-track { + background: white; + border-radius: 2px; +} + +.layui-table-body::-webkit-scrollbar-thumb { + background: #E6E6E6; + border-radius: 2px; +} + +.layui-table-body::-webkit-scrollbar-thumb:hover { + background: #E6E6E6; +} + +.layui-table-body::-webkit-scrollbar-corner { + background: #f6f6f6; +} + .pear-btn { display: inline-block; @@ -243,29 +297,7 @@ body::-webkit-scrollbar-corner { font-size: 16px; } -/** 滚动条样式 */ -body::-webkit-scrollbar { - width: 4px; - height: 4px; -} -body::-webkit-scrollbar-track { - background: white; - border-radius: 2px; -} - -body::-webkit-scrollbar-thumb { - background: #E6E6E6; - border-radius: 2px; -} - -body::-webkit-scrollbar-thumb:hover { - background: #E6E6E6; -} - -body::-webkit-scrollbar-corner { - background: #f6f6f6; -} .mainBox { diff --git a/admin/css/pearTable.css b/admin/css/pearTable.css index e0bb3d1..66ceffa 100644 --- a/admin/css/pearTable.css +++ b/admin/css/pearTable.css @@ -58,3 +58,31 @@ border-radius: 2px; color: dimgray; } + +.layui-table-body::-webkit-scrollbar { + width: 0px; + height: 0px; +} + +.layui-table-body::-webkit-scrollbar { + width: 6px; + height: 6px; +} + +.layui-table-body::-webkit-scrollbar-track { + background: white; + border-radius: 2px; +} + +.layui-table-body::-webkit-scrollbar-thumb { + background: #E6E6E6; + border-radius: 2px; +} + +.layui-table-body::-webkit-scrollbar-thumb:hover { + background: #E6E6E6; +} + +.layui-table-body::-webkit-scrollbar-corner { + background: #f6f6f6; +} \ No newline at end of file diff --git a/component/layui/lay/extends/pearAdmin.js b/component/layui/lay/extends/pearAdmin.js index 8d433e1..9040853 100644 --- a/component/layui/lay/extends/pearAdmin.js +++ b/component/layui/lay/extends/pearAdmin.js @@ -40,6 +40,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear this.themeRender(option); this.noticeRender(option); this.permissionRender(option); + this.logoRender(option); } this.permissionRender = function(option) { @@ -47,6 +48,13 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear pearAuth.loadPermission(option.auth); } } + + this.logoRender = function(option){ + + $(".layui-logo .logo").attr("src",option.logoImage); + + $(".layui-logo .title").html(option.logoTitle); + } this.menuRender = function(option) { sideMenu = pearMenu.render({ @@ -248,7 +256,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear theme += ''; $("iframe").contents().find("head").append(theme); - $("#pearone-bg-color").html(style); + $("#pearadmin-bg-color").html(style); } diff --git a/index.html b/index.html index 8a7b186..380417d 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@
+ @@ -12,10 +13,11 @@ - + + - +