diff --git a/public/css/css/basic.css b/public/css/css/basic.css deleted file mode 100644 index 921fc86..0000000 --- a/public/css/css/basic.css +++ /dev/null @@ -1,3 +0,0 @@ -.aaa { - font-size: 12px; -} diff --git a/public/css/theme/default.css b/public/css/theme/default.css index 72ec186..33e626d 100644 --- a/public/css/theme/default.css +++ b/public/css/theme/default.css @@ -1312,3 +1312,17 @@ background-position:-1px -670px overflow: scroll; 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; +} diff --git a/public/css/theme/default.less b/public/css/theme/default.less index b7ec849..fa29113 100644 --- a/public/css/theme/default.less +++ b/public/css/theme/default.less @@ -1171,3 +1171,19 @@ background-position:-1px -670px overflow: scroll; 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; +} \ No newline at end of file diff --git a/public/css/zTreeStyle/zTreeStyle.css b/public/css/zTreeStyle/zTreeStyle.css index 70a7fda..b052174 100644 --- a/public/css/zTreeStyle/zTreeStyle.css +++ b/public/css/zTreeStyle/zTreeStyle.css @@ -86,12 +86,11 @@ website: http://code.google.com/p/jquerytree/ 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; -display: inline-block; padding:0; margin:2px 0 0 15px; border:0 none; position:absolute; - background-color:transparent; background-repeat:no-repeat; background-attachment: scroll; - background-position:-110px -80px; background-image:url("./img/zTreeStandard.png"); - *background-image:url("./img/zTreeStandard.gif") +span.tmpzTreeMove_arrow { + z-index: 333;width:16px; height:30px; line-height: 30px; + display: inline-block; padding:0; margin:2px 0 0 15px; border:0 none; position:absolute; } + 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)} .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 */ .ztree .tree-title { 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; -} +} \ No newline at end of file diff --git a/public/js/app/notebook.js b/public/js/app/notebook.js index a10f123..738f02f 100644 --- a/public/js/app/notebook.js +++ b/public/js/app/notebook.js @@ -120,6 +120,8 @@ Notebook.getTreeSetting = function(isSearch, isShare){ } } ajaxPost("/notebook/dragNotebooks", {data: JSON.stringify(ajaxData)}); + + Notebook.changeNav(); } if(!isShare) { diff --git a/public/js/jquery.ztree.all-3.5.js b/public/js/jquery.ztree.all-3.5.js index fa7bc87..014b52d 100644 --- a/public/js/jquery.ztree.all-3.5.js +++ b/public/js/jquery.ztree.all-3.5.js @@ -2744,7 +2744,7 @@ curNode.addClass(setting.treeObj.attr("class")); curNode.appendTo(body); - tmpArrow = $$("", setting); + tmpArrow = $$("", setting); tmpArrow.attr("id", "zTreeMove_arrow_tmp"); tmpArrow.appendTo(body);