conflict

yangyan123 · Apr 19, 2015 · d88519f · d88519f
1 parent 5bbd667
commit d88519f
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 1.8.5/
-doc/
 *.iml
 .idea/
 .ipr
@@ -17,4 +16,6 @@ Thumbs.db
 .project
 .settings/
 node_modules/
-_site/
+_site/
+*/seaning
+git/
diff --git a/src/skin/seaning/close.png b/src/skin/seaning/close.png
diff --git a/src/skin/seaning/default.png b/src/skin/seaning/default.png
diff --git a/src/skin/seaning/icon0.png b/src/skin/seaning/icon0.png
diff --git a/src/skin/seaning/icon1.png b/src/skin/seaning/icon1.png
diff --git a/src/skin/seaning/icon10.png b/src/skin/seaning/icon10.png
diff --git a/src/skin/seaning/icon11.png b/src/skin/seaning/icon11.png
diff --git a/src/skin/seaning/icon12.png b/src/skin/seaning/icon12.png
diff --git a/src/skin/seaning/icon13.png b/src/skin/seaning/icon13.png
diff --git a/src/skin/seaning/icon2.png b/src/skin/seaning/icon2.png
diff --git a/src/skin/seaning/icon3.png b/src/skin/seaning/icon3.png
diff --git a/src/skin/seaning/icon4.png b/src/skin/seaning/icon4.png
diff --git a/src/skin/seaning/icon5.png b/src/skin/seaning/icon5.png
diff --git a/src/skin/seaning/icon6.png b/src/skin/seaning/icon6.png
diff --git a/src/skin/seaning/icon7.png b/src/skin/seaning/icon7.png
diff --git a/src/skin/seaning/icon8.png b/src/skin/seaning/icon8.png
diff --git a/src/skin/seaning/icon9.png b/src/skin/seaning/icon9.png
diff --git a/src/skin/seaning/style.css b/src/skin/seaning/style.css
@@ -0,0 +1,36 @@
+/** 
+ 
+ @Name: layer皮肤--seaning
+ @Date: 2015.04.19
+ @Author: 隐
+ @blog: seaning.com
+ @remark:
+    1.新增flat风格图标，替换layer默认图标，新图标大小为48px;
+    2.更改按钮位置，右对齐
+    3.添加title的底部border
+
+**/
+
+html #layui_layer_skinseaningstylecss{display:none; position: absolute; width:1989px;}
+
+body .layer-ext-seaning .layui-layer-title{background:#f6f6f6; color:#000; border: 1px #e7e7e7 solid;}
+body .layer-ext-seaning .layui-layer-content .layui-layer-ico{width:48px; height:48px;}
+
+body .layer-ext-seaning .layui-layer-ico0{background:url(default.png) no-repeat 0 0;}
+body .layer-ext-seaning .layui-layer-ico1{background:url(default.png) no-repeat -48px 0;}
+body .layer-ext-seaning .layui-layer-ico2{background:url(default.png) no-repeat -96px 0;}
+body .layer-ext-seaning .layui-layer-ico3{background:url(default.png) no-repeat -144px 0;}
+body .layer-ext-seaning .layui-layer-ico4{background:url(default.png) no-repeat -192px 0;}
+body .layer-ext-seaning .layui-layer-ico5{background:url(default.png) no-repeat -240px 0;}
+body .layer-ext-seaning .layui-layer-ico6{background:url(default.png) no-repeat -288px 0;}
+body .layer-ext-seaning .layui-layer-ico7{background:url(default.png) no-repeat -336px 0;}
+body .layer-ext-seaning .layui-layer-ico8{background:url(default.png) no-repeat -384px 0;}
+body .layer-ext-seaning .layui-layer-ico9{background:url(default.png) no-repeat -432px 0;}
+body .layer-ext-seaning .layui-layer-ico10{background:url(default.png) no-repeat -480px 0;}
+body .layer-ext-seaning .layui-layer-ico11{background:url(default.png) no-repeat -528px 0;}
+body .layer-ext-seaning .layui-layer-ico12{background:url(default.png) no-repeat -576px 0;}
+body .layer-ext-seaning .layui-layer-ico13{background:url(default.png) no-repeat -624px 0;}
+body .layer-ext-seaning .layui-layer-setwin .layui-layer-close1 {width: 14px; height: 14px; background:url(close.png) no-repeat;}
+body .layer-ext-seaning .layui-layer-content{border-bottom:1px #e9e9e9 solid;padding:30px;}
+body .layer-ext-seaning .layui-layer-padding{padding-top:28px;padding-left:74px;}
+body .layer-ext-seaning .layui-layer-btn{padding:5px 0;text-align:right;}
diff --git a/test/demo.html b/test/demo.html
@@ -64,7 +64,7 @@ <h2 style="padding-bottom:20px;">扩展模块：图片查看器（相册层）</
 
 //加载扩展模块
 layer.config({
-    extend: 'layer.ext.js'
+    extend: 'extend/layer.ext.js'
 });
 
 //页面一打开就执行，放入ready是为了layer所需配件（css、扩展模块）加载完毕