*f?>LQoPm4eZT+zu2ENI2yvMDD8(!Jaq@khYB@PFr=Z>fM^GXGgy`JYST};`QLs;+}$-bsT5jFs`}x
xTtYwVga3`)t%@`5DNGMxUf%fYR>RX7d~u>V1ylFg&d>*W+SAp~Wt~$(69AZog1i6#
literal 0
HcmV?d00001
diff --git a/src/skin/default/icon/full_screen.png b/src/skin/default/icon/full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9bf06ccb1b74eda6e4239037e20ab4024bd6a20
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6R~NK=9LfcRi5e
zEbxddW?)Oy5tsqu{0R{Pp$4^37}lH!ZZ6GrR0^U;lkc
fX@6g1$*YaJmGAYI004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv00000008+zyMF)x010qNS#tmY3labT3lag+-G2N400U=9L_t(Y$F0{-NF!Gq
z!13=S?yUdf#x&d7xa+pEb-Q-gW?8T;loHlGv-$<9|;~Ok8)1HvrE9H|FQ(KNUh)LI`nmbhH+W#ja7UbJzIGi;Ih&
zOWZJwzhbf2RX4cT#-9UjE-fv6DePew#vdaiBW-T+MxYJoP9~FIOT1JnJ&8u6m(LAf
zTU+~H;<~QS_xJY)fjT#M6YxCnN-CB5LE?o%;pcET?01SQXYi1!s<+eW^iL8$JUsld
zv$OM(Tf7-)Z*6Vu$z(FWNL+9@O4wrxmfex%o&{)mv0cv8mQ<6`(E<2()OLc3Q(*TU!ZL
zRc`|!dqcgotgixigTbILpU;0M(Vd;0IltfkD$wp21)6iY+*cCa-Q9g03We?fSM1HI
zxe~lU)85|R7ZT0oa=&+Ubli1|HfFQg&m_9PzyD`XPtR+>RiMQ&n#p7yNc7;~V70fm
z_YI)KMr*zSJ9l$nVBj8b4Y=eO-PqXp
zP@;xmWCjNZ?^8Xhey3>t%F4?7@-1N)Ms{du=$$iY&23)+E+&)70n4%syUp*7j*j*N
zF9NMjP?>FWsZ{z^2qBJ-kF~L}v3G$^Hz-uAz!!~1yERRFJU%}Do{a|FpbGy#tD30Z
x{uRKm;{>pr!m{1Sux!wDic0wG1n2g1^B004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv00000008+zyMF)x010qNS#tmY3labT3lag+-G2N400U@AL_t(Y$F0{vNF!Gm
z!0~@#9Nk^rO+vPHv%A@C*tK1|YqKoa7NmrB5ADH%TXM0d_25Bzsq|v$sr6E!(2LMY
z5h}G<$_5q!E$Cs*sa0r$N|i>43Th>0G@0y}m`q*|nb!{8OEcqxcbS3T`*`zx?|tLK
z`EXgLkkjoDbpy>?TU&3H%jHKyLqqLAlevf^v~_7|>AqnY1tEmcG;IbrW4^PEwk#|x
zykQu|kq|;ut5q!?kG~DH*@fLe%iP@DYt?EsXQEFhCnw(rE(2%nz%HOAkx1ODR4RW7
zA%tNV$5T^NL%C$DwQ1}gs9bOCo?lM9{@Lj0MOcKv@SrIo}Ru{
zE|)hY8jr_60y=?7}M=CQG{Yo$`@4^bbr`T6-zP4qcz
zq?bgm>bm~BM3c$n=fF#j(Ba|X4qexOHBqs+xcDV-3wYi{n;J%AvDn38v6z%-DwX;g
z=mI*Z=W4^Kr?0OsplRB?L|0c=zjcg8A`x#spHE0MolegJF9Vl=bGFcMIDFyg=;%j@
zW-^(_ilW>Bf)@0DSCtF!1OkC}RaL)}==S#ZPd=Zon|l4XHHtz#UC!ikxk-uc?(RPE
zdcAjnD<m9Px`L4wYBdhu4&rOy}i9YJ6mCm`W$dcQIy*o8yk--kw1<^B3`?=%f#D&
zprR;uHa9o_$z@elfAIVL=T8H_?DcwI+1c5dlXxzdn+gO1wr^pV8C5%QB^V6e-P_w+
zka#wm{R*2o{R|!oh3;ju*16~*z8F{xfbs25g~lg`^s{ezz6
y-;_J1emRsJwe%+LF&A(HRXLr)a$BDHx%nFqh!A0AIc^gG0000004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv00000008+zyMF)x010qNS#tmY3labT3lag+-G2N400AXQL_t(I%cYUAD}-?v
z$3M?|C`zU)lTs&(NJ-f&!eUS+6QjvuVzHVH%0D2bvsf(t2f7W5;ZjWJ1}PtdH@$b=
zxx4qi004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv00000008+zyMF)x010qNS#tmY3labT3lag+-G2N400CM_L_t(I%e9m*NMunI
zhrc7@-#iQ!5#22o5j3d?27|#W>u$46wM?>@mx;Q~pf*v&;2%(y#iBvjU=dfa$xgFu
z^4s8mkH?$m%rKsI&+nY?o_p>+H^?w`5?BC+fo|Xl_ywFq#4|Y-DbNJ)9e4otfP3H{
zFaXQ|OTacziHMgxFzPq;QvH+@)1|JfhiYFQY)(B_duhPb6?IpQEU{nxtri-ACGvi#
zU$TUfT5bkb%PXqaS;Cn**etM?d!&9&`Z|DOL_D?v1g?Owq@y!q*Lh&P4&WvtP7~|D
zKp__hRDnNrfYsEx0Nj3f5BGuP7GOnQ`+t`f+WQV`;+%S+_B04vQFk&YB@y(s27Paq
z*VKdDSxzKOs6W*$bx|EvN7QMxtlp@rYKJYZpv
seNZ=Y``IFNQ;oJzlgDpQnQze9|2|71BxJ$~tN;K207*qoM6N<$f*~Zv-v9sr
literal 0
HcmV?d00001
diff --git a/src/skin/default/layer.css b/src/skin/default/layer.css
index 5fc667e2..abbf0edb 100644
--- a/src/skin/default/layer.css
+++ b/src/skin/default/layer.css
@@ -62,7 +62,7 @@ html #layuicss-skinlayercss{display: none; position: absolute; width: 1989px;}
.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px;}
.layui-layer-setwin .layui-layer-close1{background-position: 1px -40px; cursor: pointer;}
.layui-layer-setwin .layui-layer-close1:hover{opacity:0.7;}
-.layui-layer-setwin .layui-layer-close2{position:absolute; right:-28px; top:-28px; width:30px; height:30px; margin-left:0; background-position:-149px -31px; *right:-18px; _display:none;}
+.layui-layer-setwin .layui-layer-close2{position:absolute; right:-28px; top:-28px; width:30px; height:30px; margin-left:0; background-position:-149px -31px; *right:-18px; _display:none;z-index:11}
.layui-layer-setwin .layui-layer-close2:hover{ background-position:-180px -31px;}
/* 按钮栏 */
@@ -149,19 +149,20 @@ html #layuicss-skinlayercss{display: none; position: absolute; width: 1989px;}
/* photo模式 */
.layui-layer-photos{-webkit-animation-duration: .8s; animation-duration: .8s;}
.layui-layer-photos .layui-layer-content{overflow:hidden; text-align: center;}
-.layui-layer-photos .layui-layer-phimg img{position: relative; width:100%; display: inline-block; *display:inline; *zoom:1; vertical-align:top;}
+.layui-layer-photos .layui-layer-phimg>img{ width:100%; display: inline-block; *display:inline; *zoom:1; }
.layui-layer-imguide,.layui-layer-imgbar{display:none;}
.layui-layer-imgprev, .layui-layer-imgnext{position:absolute; top:50%; width:27px; _width:44px; height:44px; margin-top:-22px; outline:none;blr:expression(this.onFocus=this.blur());}
.layui-layer-imgprev{left:10px; background-position:-5px -5px; _background-position:-70px -5px;}
.layui-layer-imgprev:hover{background-position:-33px -5px; _background-position:-120px -5px;}
.layui-layer-imgnext{right:10px; _right:8px; background-position:-5px -50px; _background-position:-70px -50px;}
.layui-layer-imgnext:hover{background-position:-33px -50px; _background-position:-120px -50px;}
-.layui-layer-imgbar{position:absolute; left:0; bottom:0; width:100%; height:32px; line-height:32px; background-color:rgba(0,0,0,.8); background-color:#000\9; filter:Alpha(opacity=80); color:#fff; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size:0;}
+.layui-layer-imgbar{position:absolute; left:0; bottom:0; width:220px; height:32px; line-height:32px; color:#fff; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size:0;}
.layui-layer-imgtit{/*position:absolute; left:20px;*/}
.layui-layer-imgtit *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;}
.layui-layer-imgtit a{max-width:65%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; color:#fff;}
.layui-layer-imgtit a:hover{color:#fff; text-decoration:underline;}
.layui-layer-imgtit em{padding-left:10px; font-style: normal;}
+.layui-layer-phimg {width: 100%; height: 100%; position: relative;}
/* 关闭动画 */
@-webkit-keyframes layer-bounceOut {
@@ -179,5 +180,246 @@ html #layuicss-skinlayercss{display: none; position: absolute; width: 1989px;}
@media screen and (max-width: 1100px) {
.layui-layer-iframe{overflow-y: auto; -webkit-overflow-scrolling: touch;}
}
+ .winControl {
+ position: absolute;
+ right: 0;
+ top: 0;
+ z-index: 99999;
+}
+.winControl span {
+ display: inline-block;
+ padding: 4px 6px;
+ cursor: pointer;
+ line-height: 10px;
+}
+.winControl span:hover {
+ background: #E82B45;
+}
+[drag] {
+ -webkit-app-region: drag;
+}
+[noDrag] {
+ -webkit-app-region: no-drag;
+}
+i{
+ position: relative;
+ z-index:99999;
+ display: inline-block;
+}
+.icon_close-big{
+ width: 18px;
+ height: 18px;
+ background-image: url('icon/close_big.png');
+}
+.icon_close-small{
+ width: 13px;
+ height: 13px;
+ background-image: url('icon/close_small.png');
+ display: inline-block;
+}
+.icon_tool-fullscreen{
+ width: 18px;
+ height: 18px;
+ background-image: url('icon/full_screen.png');
+}
+.icon_tool-bigger{
+ width: 20px;
+ height: 19px;
+ background-image: url('icon/bigger.png');
+}
+.icon_tool-smaller{
+ width: 20px;
+ height: 19px;
+ background-image: url('icon/smaller.png');
+}
+.icon_tool-rotate{
+ width: 17px;
+ height: 20px;
+ background-image: url('icon/rotate.png');
+}
+.icon_tool-download{
+ width: 16px;
+ height: 20px;
+ background-image: url('icon/download.png');
+}
+.icon_tool-prev{
+ width: 22px;
+ height: 38px;
+ background-image: url('icon/prev.png');
+}
+.icon_tool-next{
+ width: 22px;
+ height: 38px;
+ background-image: url('icon/next.png');
+}
+/* 效果 */
+.rotate0{
+ transform: rotate(0deg);
+ -webkit-transform: rotate(0deg);
+}
+.rotate90{
+ transform: rotate(90deg);
+ -webkit-transform: rotate(90deg);
+}
+.rotate180{
+ transform: rotate(180deg);
+ -webkit-transform: rotate(180deg);
+}
+.rotate270{
+ transform: rotate(270deg);
+ -webkit-transform: rotate(270deg);
+}
+@keyframes layer-bounceOut {
+ 100% {opacity: 0; -webkit-transform: scale(.7); -ms-transform: scale(.7); transform: scale(.7);}
+ 30% {-webkit-transform: scale(1.05); -ms-transform: scale(1.05); transform: scale(1.05);}
+ 0% {-webkit-transform: scale(1); -ms-transform: scale(1);transform: scale(1);}
+}
+.layer-anim-close{-webkit-animation-name: layer-bounceOut;animation-name: layer-bounceOut; -webkit-animation-duration:.2s; animation-duration:.2s;}
+@media screen and (max-width: 1100px) {
+ .layui-layer-iframe{overflow-y: auto; -webkit-overflow-scrolling: touch;}
+}
+.image{
+ position: absolute;
+ margin:0; /*之所以不使用auto直接垂直居中,是因为当图片旋转时left值会很难计算*/
+ padding:0;
+ z-index: 10;
+ display: none;
+ moz-user-select: -moz-none;
+ -moz-user-select: none;
+ -o-user-select:none;
+ -khtml-user-select:none;
+ -webkit-user-select:none;
+ -ms-user-select:none;
+ user-select:none;
+}
+.image.active{
+ display:block;
+}
+.tool{
+ position: absolute;
+ text-align: center;
+ display: none;
+ z-index: 99999;
+ bottom: 0px;
+}
+.toolct{
+ display: inline-block;
+ height: 30px;
+ background-color: #6f6965;
+ padding: 5px 14px;
+ box-sizing: border-box;
+ border-radius: 6px;
+}
+.toolct a{
+ margin-right: 20px;
+}
+.toolct span{
+ margin-right: 20px;
+}
+.toolct i{
+ display: inline-block;
+ cursor: pointer;
+}
+.percentTip{
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ right: 0;
+ left: 0;
+ margin: auto;
+ width: 100px;
+ height: 30px;
+ z-index: 9999;
+ text-align: center;
+ line-height: 30px;
+ font-size: 16px;
+ border-radius: 8px;
+ color: #ffffff;
+ filter: progid:DXImageTransform.Microsoft.Gradient(startColorStr='#4F504E',endColorStr='#151313',gradientType='1');
+ background: linear-gradient(315deg, #4F504E, #151313);
+ background: -moz-linear-gradient(315deg, #4F504E, #151313);
+ background: -o-linear-gradient(left,#4F504E, #151313);
+ background: -webkit-gradient(linear,100% 0%, 100% 0%, from(#4F504E), to(#151313));
+}
+.thumbnails{
+ position: absolute;
+ right: 1px;
+ bottom: 1px;
+ border: 1px solid #ffffff;
+ z-index: 99999;
+ border-radius: 5px;
+ background-color: rgba(177, 177, 177, 0.5);
+ display: none;
+}
+.thumbnails .thumbDrag{
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ width: 100px;
+ height: 100px;
+ border: 1px solid black;
+ box-sizing: border-box;
+}
+.thumbnails .thumbDrag span{
+ width:100%;
+ height:100%;
+ border: 1px solid white;
+ display: block;
+ box-sizing: border-box;
+}
+.thumbnails .thumbClose{
+ position: absolute;
+ right: 1px;
+ top: -2px;
+ cursor: pointer;
+ height: 13px;
+}
+.thumbnails img{
+ max-width: 100%;
+ max-height: 100%;
+ margin: auto;
+ display: block;
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ moz-user-select: -moz-none;
+ -moz-user-select: none;
+ -o-user-select:none;
+ -khtml-user-select:none;
+ -webkit-user-select:none;
+ -ms-user-select:none;
+ user-select:none;
+}
+.oper{
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ right: 0;
+ left: 0;
+ margin: auto;
+ height: 38px;
+ z-index: 99999;
+}
+.oper i{
+ display: none;
+ cursor: pointer;
+}
+.oper span{
+ width: 22px;
+ height: 38px;
+}
+.oper .prev{
+ float:left;
+ margin-left: 9px;
+}
+.oper .next{
+ float:right;
+ margin-right: 9px;
+}
+.oper .prev.active i, .oper .next.active i{
+ display: inline-block;
+}
diff --git a/test/demo.html b/test/demo.html
index 003235ab..4c3f376f 100644
--- a/test/demo.html
+++ b/test/demo.html
@@ -1,11 +1,12 @@
-
layer-更懂你的web弹窗解决方案
+
+
-
-
-
@@ -36,11 +34,16 @@
二、如果您的js引入是通过合并处理或者您不想采用layer自动获取的绝对路径,您可以通过layer.config()来配置(详见官网API页)
三、jquery需1.8+
四、更多使用说明与演示,请参见layer官网。
-五、使用时请务必保留来源,请勿用于违反我国法律法规的web平台。
-六、layer遵循MIT开源协议,将永久性提供无偿服务。
+五、使用时请务必保留来源,请勿用于违反我国法律的web平台。
+六、layer遵循LGPL协议,将永久性提供无偿服务。版权最终解释权:贤心。
-
+