theluyuan/layui-js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.9_rls

Browse Source
This commit is contained in:
sentsin
2017-03-01 00:15:02 +08:00
parent d9259ace92
commit c86084bbe8
29 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/css/layui.css
View File

@@ -31,9 +31,10 @@ pre{white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; w
@font-face {font-family: 'layui-icon';
src: url('../font/iconfont.eot?v=1.0.9');
src: url('../font/iconfont.eot?v=1.0.9#iefix') format('embedded-opentype'),
url('../font/iconfont.svg?v=1.0.9#iconfont') format('svg'),
url('../font/iconfont.woff?v=1.0.9') format('woff'),
url('../font/iconfont.ttf?v=1.0.9') format('truetype'),
url('../font/iconfont.svg?v=1.0.9#iconfont') format('svg');
url('../font/iconfont.ttf?v=1.0.9') format('truetype');
}
.layui-icon{
@@ -94,10 +95,10 @@ a cite{font-style: normal; *cursor:pointer;}
/* 进度条 */
.layui-progress{position: relative; height: 6px; border-radius: 20px; background-color: #e2e2e2;}
.layui-progress-bar{position: absolute; width: 0; height: 6px; border-radius: 20px; background-color: #5FB878; transition: all .3s; -webkit-transition: all .3s;}
.layui-progress-bar{position: absolute; width: 0; max-width: 100%; height: 6px; border-radius: 20px; text-align: right; background-color: #5FB878; transition: all .3s; -webkit-transition: all .3s;}
.layui-progress-big,
.layui-progress-big .layui-progress-bar{height: 18px; line-height: 18px; text-align: right;}
.layui-progress-text{position: absolute; right: 0; top: -16px; line-height: 18px; font-size: 12px; color: #666}
.layui-progress-big .layui-progress-bar{height: 18px; line-height: 18px;}
.layui-progress-text{position: relative; top: -18px; line-height: 18px; font-size: 12px; color: #666}
.layui-progress-big .layui-progress-text{position: static; padding: 0 10px; color: #fff;}
/* 折叠面板 */

6
src/lay/modules/element.js
View File

@@ -84,7 +84,7 @@ layui.define('jquery', function(exports){
//Tab点击
tabClick: function(e, index, liElem){
var othis = liElem || $(this)
,index = index || othis.index()
,index = index || othis.parent().children('li').index(othis)
,parents = othis.parents('.layui-tab').eq(0)
,item = parents.children('.layui-tab-content').children('.layui-tab-item')
,filter = parents.attr('lay-filter');
@@ -351,7 +351,9 @@ layui.define('jquery', function(exports){
elemBar.css('width', width);
if(othis.attr('lay-showPercent')){
setTimeout(function(){
elemBar.html('<span class="'+ ELEM +'-text">'+ Math.round(elemBar.width()/othis.width()*100) +'%</span>');
var percent = Math.round(elemBar.width()/othis.width()*100);
if(percent > 100) percent = 100;
elemBar.html('<span class="'+ ELEM +'-text">'+ percent +'%</span>');
},350);
}
});

2
src/lay/modules/form.js
View File

@@ -297,7 +297,7 @@ layui.define('layer', function(exports){
check.checked ? (' '+RE_CLASS[1]) : '') + (disabled ? ' layui-checkbox-disbaled '+DISABLED : '') +'" lay-skin="'+ (skin||'') +'">'
,{
_switch: '<em>'+ ((check.checked ? text[0] : text[1])||'') +'</em><i></i>'
}[skin] || ('<span>'+ (check.title || '勾选') +'</span><i class="layui-icon">'+ (skin ? '&#xe605;' : '&#xe618;') +'</i>')
}[skin] || ((check.title.replace(/\s/g, '') ? ('<span>'+ check.title +'</span>') : '') +'<i class="layui-icon">'+ (skin ? '&#xe605;' : '&#xe618;') +'</i>')
,'</div>'].join(''));
hasRender[0] && hasRender.remove(); //如果已经渲染，则Rerender

2
src/layui.js
View File

@@ -13,7 +13,7 @@
"use strict";
var Lay = function(){
this.v = '1.0.9'; //版本号
this.v = '1.0.9_rls'; //版本号
};
Lay.fn = Lay.prototype;