From 1b0682eea45f44687c57c90ca4bad4b9ef36acd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E4=BB=AA=E5=BC=8F?= <854085467@qq.com>
Date: Thu, 23 Jul 2020 20:26:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9C=E9=97=B4=E4=B8=BB?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
admin/css/admin.css | 25 -------------------------
component/pear/module/admin.js | 12 +-----------
2 files changed, 1 insertion(+), 36 deletions(-)
diff --git a/admin/css/admin.css b/admin/css/admin.css
index df2a98c..a82d940 100644
--- a/admin/css/admin.css
+++ b/admin/css/admin.css
@@ -125,7 +125,6 @@
.pear-admin .layui-header .layui-nav .layui-this:after {
display: none;
}
-
/** 新增兼容 */
@media screen and (max-width:768px) {
.pear-mini .bottom-nav {
@@ -169,7 +168,6 @@
display: none;
}
}
-
@-webkit-keyframes am-horizontal-roll_show {
0% {
opacity: 1;
@@ -183,7 +181,6 @@
transform: translateX(0)
}
}
-
@keyframes am-horizontal-roll_show {
0% {
opacity: 1;
@@ -199,45 +196,29 @@
transform: translateX(0)
}
}
-
.layer-anim-right {
-webkit-animation: am-horizontal-roll_show .6s ease-out;
animation: am-horizontal-roll_show .6s ease-out;
}
-
-
/** 亮色侧边风格 */
.light-theme .layui-logo {
background-color: white !important;
color: black !important;
}
-
.light-theme .layui-side-scroll {
background-color: white !important;
color: black !important;
}
-.light-theme .layui-side{
- box-shadow: none;
- border-right: 1px whitesmoke solid;
-}
-
-
-
-
/** 主 题 选 择 界 面 样 式 */
-
.pearone-color .color-title {padding: 15px 0 0px 20px;margin-bottom: 4px;}
.pearone-color .color-content {
padding: 15px 10px 0 20px;
-
}
-
.pearone-color .color-content ul {
list-style: none;
padding: 0px;
}
-
.pearone-color .color-content ul li {
position: relative;
display: inline-block;
@@ -251,7 +232,6 @@
font-size: 12px;
color: #666;
}
-
.pearone-color .color-content li.layui-this:after,
.pearone-color .color-content li:hover:after {
width: 100%;
@@ -263,7 +243,6 @@
opacity: 1;
border-radius: 4px;
}
-
.pearone-color .color-content li:after {
content: '';
position: absolute;
@@ -277,21 +256,17 @@
-webkit-transition: all .3s;
opacity: 0;
}
-
.select-color {
margin-bottom: 30px;
}
-
.select-color .select-color-title {
padding: 15px 0 0px 20px;
margin-bottom: 4px;
}
-
.select-color .select-color-content {
padding: 20px 0 0px 0px;
margin-bottom: 4px;
}
-
.select-color .select-color-content .select-color-item {
background-color: gray;
width: 30px;
diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js
index ce315fb..0daca11 100644
--- a/component/pear/module/admin.js
+++ b/component/pear/module/admin.js
@@ -16,9 +16,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
var pearAdmin = new function() {
this.render = function(option) {
-
var option = getData();
-
this.menuRender(option);
this.bodyRender(option);
this.keepLoad(option);
@@ -104,7 +102,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
bodyFrame = pearFrame.render({
elem: 'content',
title: '工作空间 / 首页',
- url: option.index,
+ url: option.tab.index.href,
width: '100%',
height: '100%'
});
@@ -163,7 +161,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
this.menuSkin = function(theme) {
$(".pear-admin").removeClass("light-theme");
$(".pear-admin").removeClass("dark-theme");
- $(".pear-admin").removeClass("night-theme");
$(".pear-admin").addClass(theme);
}
@@ -314,13 +311,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
'' +
'';
- bgColorHtml +=
- '' +
- '' +
- '
' +
- '
' +
- '' +
- '';
var html =
'