xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all is ok, waitting to edit default theme

Browse Source
This commit is contained in:
iiuazz
2014-09-12 20:42:40 +08:00
parent 52010e4fc1
commit e6fb6e3f09
6 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/css/css/basic.css
View File

@ -1,3 +0,0 @@
.aaa {
font-size: 12px;
}

14
public/css/theme/default.css
View File

@ -1312,3 +1312,17 @@ background-position:-1px -670px
overflow: scroll; overflow: scroll;
list-style: none; list-style: none;
} }
.notebook-setting {
display: none;
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
}
.notebook-setting:before {
content: "\f013";
}
.ztree li a:hover .notebook-setting {
display: block;
}

16
public/css/theme/default.less
View File

@ -1171,3 +1171,19 @@ background-position:-1px -670px
overflow: scroll; overflow: scroll;
list-style: none; list-style: none;
} }
// 设置
.notebook-setting {
display: none;
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
}
.notebook-setting:before {
content: "\f013";
}
.ztree li a:hover .notebook-setting {
display: block;
}

32
public/css/zTreeStyle/zTreeStyle.css
View File

@ -86,12 +86,11 @@ website: http://code.google.com/p/jquerytree/
ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)} ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)}
/* 移动 */ /* 移动 */
span.tmpzTreeMove_arrow {z-index: 333;width:16px; height:30px; line-height: 30px; span.tmpzTreeMove_arrow {
display: inline-block; padding:0; margin:2px 0 0 15px; border:0 none; position:absolute; z-index: 333;width:16px; height:30px; line-height: 30px;
background-color:transparent; background-repeat:no-repeat; background-attachment: scroll; display: inline-block; padding:0; margin:2px 0 0 15px; border:0 none; position:absolute;
background-position:-110px -80px; background-image:url("./img/zTreeStandard.png");
*background-image:url("./img/zTreeStandard.gif")
} }
ul.ztree.zTreeDragUL {z-index: 333;margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; ul.ztree.zTreeDragUL {z-index: 333;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)} background-color:cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
.zTreeMask {z-index:1000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute} .zTreeMask {z-index:1000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
@ -137,25 +136,4 @@ ul.ztree.zTreeDragUL {z-index: 333;margin:0; padding:0; position:absolute; width
/* life */ /* life */
.ztree .tree-title { .ztree .tree-title {
display: inline-block; display: inline-block;
} }
/*
.ztree li a input.rename {height:14px; width:80px; padding:0; margin:0;
font-size:12px; border:1px #7EC4CC solid; *border:0px}
*/
.ztree li a.curSelectedNode_Edit input {
}
.notebook-setting {
display: none;
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
}
.notebook-setting:before {
content: "\f013";
}
.ztree li a:hover .notebook-setting {
display: block;
}

2
public/js/app/notebook.js
View File

@ -120,6 +120,8 @@ Notebook.getTreeSetting = function(isSearch, isShare){
} }
} }
ajaxPost("/notebook/dragNotebooks", {data: JSON.stringify(ajaxData)}); ajaxPost("/notebook/dragNotebooks", {data: JSON.stringify(ajaxData)});
Notebook.changeNav();
} }
if(!isShare) { if(!isShare) {

2
public/js/jquery.ztree.all-3.5.js
View File

@ -2744,7 +2744,7 @@
curNode.addClass(setting.treeObj.attr("class")); curNode.addClass(setting.treeObj.attr("class"));
curNode.appendTo(body); curNode.appendTo(body);
tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting); tmpArrow = $$("<span class='fa fa-arrow-right tmpzTreeMove_arrow'></span>", setting);
tmpArrow.attr("id", "zTreeMove_arrow_tmp"); tmpArrow.attr("id", "zTreeMove_arrow_tmp");
tmpArrow.appendTo(body); tmpArrow.appendTo(body);