diff --git a/dist/icon/loading.gif b/dist/icon/loading.gif new file mode 100644 index 0000000000..d04fdd2127 Binary files /dev/null and b/dist/icon/loading.gif differ diff --git a/dist/resource.css b/dist/resource.css index 6d7da7dfaf..9545b02e11 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -6353,6 +6353,9 @@ textarea::-webkit-scrollbar-thumb { * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .farbtastic { position: relative; } @@ -6373,19 +6376,19 @@ textarea::-webkit-scrollbar-thumb { height: 101px; } .farbtastic .wheel { - background: url(third/farbtastic/wheel.png) no-repeat; + background: url("third/farbtastic/wheel.png") no-repeat; width: 195px; height: 195px; } .farbtastic .overlay { - background: url(third/farbtastic/mask.png) no-repeat; + background: url("third/farbtastic/mask.png") no-repeat; } .farbtastic .marker { width: 17px; height: 17px; margin: -8px 0 0 -8px; overflow: hidden; - background: url(third/farbtastic/marker.png) no-repeat; + background: url("third/farbtastic/marker.png") no-repeat; } /*------------------------------------- zTree Style @@ -6396,6 +6399,9 @@ email: hunter.z@263.net website: http://code.google.com/p/jquerytree/ -------------------------------------*/ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .ztree * { padding: 0; margin: 0; @@ -6418,7 +6424,7 @@ website: http://code.google.com/p/jquerytree/ padding: 0 0 0 18px; } .ztree li ul.line { - background: url(icon/tree-vertical-line-1.png) 0 0 repeat-y; + background: url("icon/tree-vertical-line-1.png") 0 0 repeat-y; } .ztree li a { padding: 1px 3px 0 0; diff --git a/src/css/resource/third/farbtastic/farbtastic.css b/src/css/resource/third/farbtastic/farbtastic.css index 914bfc9044..4cc3633d39 100644 --- a/src/css/resource/third/farbtastic/farbtastic.css +++ b/src/css/resource/third/farbtastic/farbtastic.css @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .farbtastic { position: relative; } @@ -36,17 +39,17 @@ height: 101px; } .farbtastic .wheel { - background: url(third/farbtastic/wheel.png) no-repeat; + background: url("third/farbtastic/wheel.png") no-repeat; width: 195px; height: 195px; } .farbtastic .overlay { - background: url(third/farbtastic/mask.png) no-repeat; + background: url("third/farbtastic/mask.png") no-repeat; } .farbtastic .marker { width: 17px; height: 17px; margin: -8px 0 0 -8px; overflow: hidden; - background: url(third/farbtastic/marker.png) no-repeat; + background: url("third/farbtastic/marker.png") no-repeat; } diff --git a/src/css/resource/third/ztree/zTreeStyle.css b/src/css/resource/third/ztree/zTreeStyle.css index 9b43f37d54..3399d88b94 100644 --- a/src/css/resource/third/ztree/zTreeStyle.css +++ b/src/css/resource/third/ztree/zTreeStyle.css @@ -7,6 +7,9 @@ email: hunter.z@263.net website: http://code.google.com/p/jquerytree/ -------------------------------------*/ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .ztree * { padding: 0; margin: 0; @@ -29,7 +32,7 @@ website: http://code.google.com/p/jquerytree/ padding: 0 0 0 18px; } .ztree li ul.line { - background: url(icon/tree-vertical-line-1.png) 0 0 repeat-y; + background: url("icon/tree-vertical-line-1.png") 0 0 repeat-y; } .ztree li a { padding: 1px 3px 0 0; diff --git a/src/less/resource/third/farbtastic/farbtastic.less b/src/less/resource/third/farbtastic/farbtastic.less index b703841469..cec7926ab0 100644 --- a/src/less/resource/third/farbtastic/farbtastic.less +++ b/src/less/resource/third/farbtastic/farbtastic.less @@ -16,6 +16,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import "../../../bibase"; + .farbtastic { position: relative; } @@ -34,18 +36,18 @@ height: 101px; } .farbtastic .wheel { - background: url(third/farbtastic/wheel.png) no-repeat; + background: url("@{imageUrl}third/farbtastic/wheel.png") no-repeat; width: 195px; height: 195px; } .farbtastic .overlay { - background: url(third/farbtastic/mask.png) no-repeat; + background: url("@{imageUrl}third/farbtastic/mask.png") no-repeat; } .farbtastic .marker { width: 17px; height: 17px; margin: -8px 0 0 -8px; overflow: hidden; - background: url(third/farbtastic/marker.png) no-repeat; + background: url("@{imageUrl}third/farbtastic/marker.png") no-repeat; } diff --git a/src/less/resource/third/ztree/zTreeStyle.less b/src/less/resource/third/ztree/zTreeStyle.less index e4bcf31809..66cedd0aec 100644 --- a/src/less/resource/third/ztree/zTreeStyle.less +++ b/src/less/resource/third/ztree/zTreeStyle.less @@ -7,12 +7,13 @@ email: hunter.z@263.net website: http://code.google.com/p/jquerytree/ -------------------------------------*/ +@import "../../../bibase"; .ztree * {padding:0; margin:0; } .ztree {margin:0; padding:5px; } .ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0} .ztree li ul{ margin:0; padding:0 0 0 18px} -.ztree li ul.line{ background:url(icon/tree-vertical-line-1.png) 0 0 repeat-y;} +.ztree li ul.line{ background:url("@{imageUrl}icon/tree-vertical-line-1.png") 0 0 repeat-y;} .ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:24px; background-color: transparent; text-decoration:none; vertical-align:top; display: inline-block} @@ -28,33 +29,33 @@ website: http://code.google.com/p/jquerytree/ .ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle; border:0 none; cursor: pointer;outline:none; background-color:transparent; background-repeat:no-repeat; background-attachment: scroll; - background-image:url("third/ztree/img/zTreeStandard.png"); *background-image:url("third/ztree/img/zTreeStandard.gif")} + background-image:url("@{imageUrl}third/ztree/img/zTreeStandard.png"); *background-image:url("@{imageUrl}third/ztree/img/zTreeStandard.gif")} .ztree li span.button.chk {width:16px; height:16px; margin:0 3px 0 0; cursor: auto} .ztree li span.button.chk.checkbox_false_full { - background-image:url("icon/check-box-normal.png"); + background-image:url("@{imageUrl}icon/check-box-normal.png"); } .ztree li span.button.chk.checkbox_false_full_focus { - background-image:url("icon/check-box-normal.png"); + background-image:url("@{imageUrl}icon/check-box-normal.png"); } .ztree li span.button.chk.checkbox_false_part { - background-image:url("icon/half_selected.png"); + background-image:url("@{imageUrl}icon/half_selected.png"); } .ztree li span.button.chk.checkbox_false_part_focus { - background-image:url("icon/half_selected.png"); + background-image:url("@{imageUrl}icon/half_selected.png"); } .ztree li span.button.chk.checkbox_false_disable {background-position:0 -56px} .ztree li span.button.chk.checkbox_true_full { - background-image:url("icon/check-box-active.png"); + background-image:url("@{imageUrl}icon/check-box-active.png"); } .ztree li span.button.chk.checkbox_true_full_focus { - background-image:url("icon/check-box-active.png"); + background-image:url("@{imageUrl}icon/check-box-active.png"); } .ztree li span.button.chk.checkbox_true_part { - background-image:url("icon/half_selected.png"); + background-image:url("@{imageUrl}icon/half_selected.png"); } .ztree li span.button.chk.checkbox_true_part_focus { - background-image:url("icon/half_selected.png"); + background-image:url("@{imageUrl}icon/half_selected.png"); } .ztree li span.button.chk.checkbox_true_disable {background-position:-14px -56px} .ztree li span.button.chk.radio_false_full {background-position:-28px 0} @@ -70,40 +71,40 @@ website: http://code.google.com/p/jquerytree/ .ztree li span.button.switch {width:25px; height:25px} .ztree li span.button.root_open{ - background-image:url("icon/tree-expand-1.png"); + background-image:url("@{imageUrl}icon/tree-expand-1.png"); } .ztree li span.button.root_close{ - background-image:url("icon/tree-collapse-1.png"); + background-image:url("@{imageUrl}icon/tree-collapse-1.png"); } .ztree li span.button.roots_open{ - background-image:url("icon/tree-expand-2.png"); + background-image:url("@{imageUrl}icon/tree-expand-2.png"); } .ztree li span.button.roots_close{ - background-image:url("icon/tree-collapse-2.png"); + background-image:url("@{imageUrl}icon/tree-collapse-2.png"); } .ztree li span.button.center_open{ - background-image:url("icon/tree-expand-3.png"); + background-image:url("@{imageUrl}icon/tree-expand-3.png"); } .ztree li span.button.center_close{ - background-image:url("icon/tree-collapse-3.png"); + background-image:url("@{imageUrl}icon/tree-collapse-3.png"); } .ztree li span.button.bottom_open{ - background-image:url("icon/tree-expand-4.png"); + background-image:url("@{imageUrl}icon/tree-expand-4.png"); } .ztree li span.button.bottom_close{ - background-image:url("icon/tree-collapse-4.png"); + background-image:url("@{imageUrl}icon/tree-collapse-4.png"); } .ztree li span.button.noline_open{background-position:-92px -72px} .ztree li span.button.noline_close{background-position:-74px -72px} .ztree li span.button.root_docu{ background:none;} .ztree li span.button.roots_docu{ - background-image:url("icon/tree-vertical-line-2.png"); + background-image:url("@{imageUrl}icon/tree-vertical-line-2.png"); } .ztree li span.button.center_docu{ - background-image:url("icon/tree-vertical-line-3.png"); + background-image:url("@{imageUrl}icon/tree-vertical-line-3.png"); } .ztree li span.button.bottom_docu{ - background-image:url("icon/tree-vertical-line-4.png"); + background-image:url("@{imageUrl}icon/tree-vertical-line-4.png"); } .ztree li span.button.noline_docu{ background:none;} @@ -113,13 +114,13 @@ website: http://code.google.com/p/jquerytree/ .ztree li span.button.edit {margin-right:2px; background-position:-110px -48px; vertical-align:top; *vertical-align:middle} .ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; *vertical-align:middle} -.ztree li span.button.ico_loading{width: 0px;margin-right:2px; background:url("third/ztree/img/loading.gif") no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle} +.ztree li span.button.ico_loading{width: 0px;margin-right:2px; background:url("@{imageUrl}third/ztree/img/loading.gif") no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle} ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)} span.tmpzTreeMove_arrow {width:16px; height:16px; display: inline-block; padding:0; margin:2px 0 0 1px; border:0 none; position:absolute; background-color:transparent; background-repeat:no-repeat; background-attachment: scroll; - background-position:-110px -80px; background-image:url("third/ztree/img/zTreeStandard.png"); *background-image:url("third/ztree/img/zTreeStandard.gif")} + background-position:-110px -80px; background-image:url("@{imageUrl}third/ztree/img/zTreeStandard.png"); *background-image:url("@{imageUrl}third/ztree/img/zTreeStandard.gif")} ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)} .zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}