跟进 layui 2.6.1

admin/css/admin.css

@@ -93,11 +93,12 @@ body,
 .pear-admin .layui-body {
 	left: 230px;
 	bottom: 0px;
+	margin-top: 60px;
+	padding-bottom: 0px;
 }
 
 .pear-admin .layui-layout-left {
 	left: 0px;
-
 }
 
 /** 隐 藏 布 局 样 式 */

admin/css/load.css

@@ -4,7 +4,6 @@
 	height: 100%;
 	background-color: whitesmoke;
 	z-index: 9999999;
-	margin-top: -61px;
 }
 .loader {
 	width: 50px;

component/pear/module/admin.js

@@ -507,6 +507,19 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm
 				res("返回值");
 			});
 		}
+		
+		function isFullscreen(){
+		    return document.fullscreenElement    ||
+		           document.msFullscreenElement  ||
+		           document.mozFullScreenElement ||
+		           document.webkitFullscreenElement || false;
+		}
+		
+		window.onresize = function() {
+			if (!isFullscreen()) {
+			    $(".fullScreen").eq(0).removeClass("layui-icon-screen-restore");
+			}
+		}
 
 		exports('admin', pearAdmin);
 	})

component/pear/module/message.js

@@ -22,7 +22,9 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 			var notice = createHtml(option);
 			$(option.elem).html(notice);
 		}
-		element.init();
+		setTimeout(function(){
+			element.init();
+		},300);
 		return new message(option);
 	}
 	

component/pear/module/theme.js

@@ -69,6 +69,7 @@ layui.define(["jquery","layer"], function (exports) {
 		style += '.layui-form-checkbox[lay-skin=primary]:hover i{border-color:'+color+'!important}'
 		style += '.pear-tab-menu .item:hover{background-color:'+color+'!important}'
 		style += '.layui-form-danger:focus {border-color:#FF5722 !important}'
+		style += '.pear-admin .user a:hover{color:'+color+'!important}'
 		var colorPane = $("#pear-admin-color");
 		if(colorPane.length>0){
 			colorPane.html(style);

component/pear/pear.js

@@ -5,7 +5,7 @@ window.rootPath = (function(src) {
 
 layui.config({
 	base: rootPath + "module/",
-	version: "3.8.0.Release"
+	version: "3.7.6.Release"
 }).extend({
 	admin: "admin", 	// 框架布局组件
 	menu: "menu",		// 数据菜单组件

index.html

@@ -27,7 +27,7 @@
 					<li class="layui-nav-item layui-hide-xs"><a href="#" class="fullScreen layui-icon layui-icon-screen-full"></a></li>
 					<li class="layui-nav-item layui-hide-xs"><a href="http://www.pearadmin.com" class="layui-icon layui-icon-website"></a></li>
 					<li class="layui-nav-item layui-hide-xs message"></li>
-					<li class="layui-nav-item">
+					<li class="layui-nav-item user">
 						<!-- 头 像 -->
 						<a href="javascript:;">
 							<img src="admin/images/avatar.jpg" class="layui-nav-img">