+
-
+
@@ -282,13 +290,9 @@ function log(o) {
-
@@ -312,19 +316,24 @@ function log(o) {
-
-
+
+
-
+
+
@@ -978,11 +989,13 @@ initSlimScroll();
+
@@ -990,7 +1003,6 @@ initSlimScroll();
-
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 dacdd7e..5719d8c 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -1 +1,5 @@
-@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}@font-face{font-family:'leanoteregular';src:url('../../fonts/leanote/leanote-regular-webfont.eot');src:url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'),url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'),url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');font-weight:normal;font-style:normal}#logo{font-family:"leanoteregular";font-size:36px}#logo:before{content:"a"}#switcher span{font-family:"leanoteregular";border-radius:5px;display:inline-block;cursor:pointer;font-size:18px;height:34px;line-height:34px;margin-top:8px;padding:0 5px}#switcher span:before{content:"b"}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:14px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#25313e;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header a{color:#ccc}#header li{color:#000}#header li a{color:#000}#logo,#logo span{line-height:50px}#logo{width:140px;height:59px;padding-left:10px;padding-top:0;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.1)}#logo span{background-color:#000;border-radius:10px;display:inline-block;padding:4px 0;line-height:1.0}#switcher{line-height:50px;padding-top:6px;padding-right:5px;width:30px;text-align:center}#switcher i{font-size:16px;cursor:pointer}#switcher i:hover{color:#0fb264}#switcher span{border-radius:5px;background-color:#000;cursor:pointer;font-size:16px}#switcher span:hover{color:#0fb264}#searchNote{padding-left:0;line-height:60px;margin:0}#searchNote input{background-size:18px 13px;border-color:#ebeff2;border:0;color:#ccc;background-color:#000;padding-left:14px;border-radius:5px;width:250px;line-height:20px;box-shadow:none}#searchNote input:focus{outline:none!important;border-color:#0fb264;box-shadow:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border-radius:0;margin:0;-webkit-box-shadow:none;box-shadow:none;border:1px solid #0fb264;overflow-x:hidden;overflow-y:auto}.dropdown-menu li{padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu>li>a{color:#000;display:inline-block;padding:3px 3px}.dropdown-menu>li:hover,.dropdown-menu>li:focus{background-color:#ebeff2}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:59px;left:0;right:0;bottom:0;overflow:auto;zoom:1}#mainMask{position:absolute;left:0;right:0;bottom:0;top:0;background-color:#fff;text-align:center;padding-top:100px;z-index:1000}.noteSplit{position:absolute;top:0;width:5px;height:100%;overflow:hidden;z-index:5;cursor:col-resize}#notebookSplitter{left:170px}#noteSplitter{left:250px}#leftNotebook{position:absolute;left:0;top:0;bottom:0;width:170px}#notebook,#notebookMin{position:absolute;left:0;bottom:0;top:0;right:0;background-color:#41586e;z-index:2}#notebookMin{z-index:1;overflow-y:visible;overflow-x:visible;background-color:#41586e}#notebookMin div.minContainer{border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.3);padding:5px;position:relative}#notebookMin div.minContainer i{font-size:20px;color:#fff}#notebookMin div.minContainer:hover i{color:#0fb264}#notebookMin div.minContainer ul{background-color:#fff;opacity:.8;display:none;list-style:none;margin:0;margin-left:20px;padding:5px 0;border:1px solid #0fb264;position:absolute;z-index:1000;top:0;left:10px;width:150px}#notebookMin div.minContainer ul li{padding:0 5px;cursor:pointer}#notebookMin div.minContainer ul li span{cursor:pointer}#notebookMin div.minContainer ul li a{cursor:pointer}#notebookBottom{position:absolute;bottom:0;height:30px;right:0;left:0;line-height:30px;text-align:right;padding-right:5px;background-color:#eee}#notebookBottom #leftSwitcher{border:1px solid #ccc;padding:3px 8px;cursor:pointer}#noteAndEditor{position:absolute;bottom:0;top:0;right:0;left:170px}#noteList{position:absolute;bottom:0;top:0;width:250px;overflow-x:hidden;overflow-y:hidden;border-right:1px solid #cfcfcf;border-left:1px solid #cfcfcf}#note{position:absolute;bottom:0;top:0;left:250px;right:0;padding-left:5px;overflow-y:hidden;overflow-x:auto;background-color:#fff}.folderHeader{min-height:35px;line-height:35px;cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.05)}.folderHeader span{display:inline-block;line-height:35px;color:#fff;font-size:16px}.folderHeader .fa-left,.each-user .fa{display:inline-block;line-height:35px;font-size:16px;width:35px;border-right:1px solid rgba(255,255,255,0.05);text-align:center;color:#fff}.each-user div{cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.05)}.each-user div span{display:inline-block;line-height:35px;color:#fff;padding-left:3px;font-size:14px}.each-user div .fa{width:20px;border-right:0}.each-user ul{list-style:none;margin:0;padding:0}.each-user ul a{padding-left:20px;font-size:12px}#addNotebookPlus{padding-right:10px;color:#adbece}#addNotebookPlus .fa{font-size:16px}.closed .folder-icon{width:9px;height:11px;background-position:-108px -149px}.closed .folderBody{display:none}.folderBody{list-style:none;margin:0;padding:0;background-color:#37485e}.folderBody li{line-height:30px}.folderBody a{padding-left:20px;display:block;color:#adbece;cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.05);line-height:35px}.folderBody a:hover,.folderBody .contextmenu-hover{color:#fff;background-color:rgba(0,0,0,0.05)!important}.folderBody a.active,.folderBody a.active:hover{background-color:#25313e!important;color:#fff}#notebookList input{border:1px solid #ebeff2;width:90%;box-shadow:none}#notebookList input:focus{outline:none!important;border-color:#0fb264}#myTag .folderBody li{position:relative}#myTag .folderBody li .badge{width:40px;position:absolute;right:3px;top:7px;font-weight:normal;background-color:#fff;color:#000;border:1px solid #ebeff2}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#eee;border-bottom:1px solid #ebeff2}#sortType{float:right}#noteItemList{position:absolute;left:0;right:0;bottom:0;top:0;width:100%;overflow-y:hidden;background-color:#f7f7f7;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important;color:#000}.item-active,#noteItemList .item-active:hover{background-color:#65bd77!important;color:#fff}.item-active .item-desc .fa,#noteItemList .item-active:hover .item-desc .fa{color:#eee!important}.item-active .item-title,#noteItemList .item-active:hover .item-title{color:#fff}#noteItemList .item-thumb{width:100px;overflow:hidden;position:absolute;z-index:1;right:0;height:100px;background-color:#fff;margin-right:5px;line-height:100px;text-align:center}.item-thumb img{max-width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;top:1px;padding:3px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-blog:hover{opacity:.8}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitleDiv{height:30px;border-bottom:1px solid #ddd}#noteTitle{height:100%;padding:0 3px;width:100%;border:0;background-color:#fff}#noteTitle:focus{outline:none!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}#editor,#mdEditor{position:absolute;z-index:2;top:71px;bottom:0;right:0;left:5px;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;border-bottom:1px solid #ccc;background-color:#f0f0f0}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fff}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;padding-left:5px;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right{padding:0 5px}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#leanoteMsg{line-height:40px;margin-top:10px;margin-left:10px}#newNoteWrap{line-height:40px;margin-top:10px}#loading{display:inline-block;width:20px;height:20px;content:url(../../images/loading-a-20.gif);vertical-align:middle;visibility:hidden}#toggleEditorMode{margin:0 10px!important}#upload{position:absolute;z-index:0;bottom:0;right:0;left:0;padding:0;background-color:#fff;text-align:center;display:none}#upload #drop{width:100%;height:100%;padding-top:100px}#drop.in{border:1px solid #000}#drop.hover{border:2px solid #000}#uploadMsg{position:absolute;top:3px;right:3px;bottom:10px;overflow:scroll;list-style:none}
\ No newline at end of file
+<<<<<<< HEAD
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}@font-face{font-family:'leanoteregular';src:url('../../fonts/leanote/leanote-regular-webfont.eot');src:url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'),url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'),url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');font-weight:normal;font-style:normal}#logo{font-family:"leanoteregular";font-size:36px}#logo:before{content:"a"}#switcher span{font-family:"leanoteregular";border-radius:5px;display:inline-block;cursor:pointer;font-size:18px;height:34px;line-height:34px;margin-top:8px;padding:0 5px}#switcher span:before{content:"b"}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:14px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#25313e;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header a{color:#ccc}#header li{color:#000}#header li a{color:#000}#logo,#logo span{line-height:50px}#logo{width:140px;height:59px;padding-left:10px;padding-top:0;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.1)}#logo span{background-color:#000;border-radius:10px;display:inline-block;padding:4px 0;line-height:1.0}#switcher{line-height:50px;padding-top:6px;padding-right:5px;width:30px;text-align:center}#switcher i{font-size:16px;cursor:pointer}#switcher i:hover{color:#0fb264}#switcher span{border-radius:5px;background-color:#000;cursor:pointer;font-size:16px}#switcher span:hover{color:#0fb264}#searchNote{padding-left:0;line-height:60px;margin:0}#searchNote input{background-size:18px 13px;border-color:#ebeff2;border:0;color:#ccc;background-color:#000;padding-left:14px;border-radius:5px;width:250px;line-height:20px;box-shadow:none}#searchNote input:focus{outline:none!important;border-color:#0fb264;box-shadow:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border-radius:0;margin:0;-webkit-box-shadow:none;box-shadow:none;border:1px solid #0fb264;overflow-x:hidden;overflow-y:auto}.dropdown-menu li{padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu>li>a{color:#000;display:inline-block;padding:3px 3px}.dropdown-menu>li:hover,.dropdown-menu>li:focus{background-color:#ebeff2}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:59px;left:0;right:0;bottom:0;overflow:auto;zoom:1}#mainMask{position:absolute;left:0;right:0;bottom:0;top:0;background-color:#fff;text-align:center;padding-top:100px;z-index:1000}.noteSplit{position:absolute;top:0;width:5px;height:100%;overflow:hidden;z-index:5;cursor:col-resize}#notebookSplitter{left:170px}#noteSplitter{left:250px}#leftNotebook{position:absolute;left:0;top:0;bottom:0;width:170px}#notebook,#notebookMin{position:absolute;left:0;bottom:0;top:0;right:0;background-color:#41586e;z-index:2}#notebookMin{z-index:1;overflow-y:visible;overflow-x:visible;background-color:#41586e}#notebookMin div.minContainer{border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.3);padding:5px;position:relative}#notebookMin div.minContainer i{font-size:20px;color:#fff}#notebookMin div.minContainer:hover i{color:#0fb264}#notebookMin div.minContainer ul{background-color:#fff;opacity:.8;display:none;list-style:none;margin:0;margin-left:20px;padding:5px 0;border:1px solid #0fb264;position:absolute;z-index:1000;top:0;left:10px;width:150px}#notebookMin div.minContainer ul li{padding:0 5px;cursor:pointer}#notebookMin div.minContainer ul li span{cursor:pointer}#notebookMin div.minContainer ul li a{cursor:pointer}#notebookBottom{position:absolute;bottom:0;height:30px;right:0;left:0;line-height:30px;text-align:right;padding-right:5px;background-color:#eee}#notebookBottom #leftSwitcher{border:1px solid #ccc;padding:3px 8px;cursor:pointer}#noteAndEditor{position:absolute;bottom:0;top:0;right:0;left:170px}#noteList{position:absolute;bottom:0;top:0;width:250px;overflow-x:hidden;overflow-y:hidden;border-right:1px solid #cfcfcf;border-left:1px solid #cfcfcf}#note{position:absolute;bottom:0;top:0;left:250px;right:0;padding-left:5px;overflow-y:hidden;overflow-x:auto;background-color:#fff}.folderHeader{min-height:35px;line-height:35px;cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.05)}.folderHeader span{display:inline-block;line-height:35px;color:#fff;font-size:16px}.folderHeader .fa-left,.each-user .fa{display:inline-block;line-height:35px;font-size:16px;width:35px;border-right:1px solid rgba(255,255,255,0.05);text-align:center;color:#fff}.each-user div{cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.05)}.each-user div span{display:inline-block;line-height:35px;color:#fff;padding-left:3px;font-size:14px}.each-user div .fa{width:20px;border-right:0}.each-user ul{list-style:none;margin:0;padding:0}.each-user ul a{padding-left:20px;font-size:12px}#addNotebookPlus{padding-right:10px;color:#adbece}#addNotebookPlus .fa{font-size:16px}.closed .folder-icon{width:9px;height:11px;background-position:-108px -149px}.closed .folderBody{display:none}.folderBody{list-style:none;margin:0;padding:0;background-color:#37485e}.folderBody li{line-height:30px}.folderBody a{padding-left:20px;display:block;color:#adbece;cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.05);line-height:35px}.folderBody a:hover,.folderBody .contextmenu-hover{color:#fff;background-color:rgba(0,0,0,0.05)!important}.folderBody a.active,.folderBody a.active:hover{background-color:#25313e!important;color:#fff}#notebookList input{border:1px solid #ebeff2;width:90%;box-shadow:none}#notebookList input:focus{outline:none!important;border-color:#0fb264}#myTag .folderBody li{position:relative}#myTag .folderBody li .badge{width:40px;position:absolute;right:3px;top:7px;font-weight:normal;background-color:#fff;color:#000;border:1px solid #ebeff2}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#eee;border-bottom:1px solid #ebeff2}#sortType{float:right}#noteItemList{position:absolute;left:0;right:0;bottom:0;top:0;width:100%;overflow-y:hidden;background-color:#f7f7f7;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important;color:#000}.item-active,#noteItemList .item-active:hover{background-color:#65bd77!important;color:#fff}.item-active .item-desc .fa,#noteItemList .item-active:hover .item-desc .fa{color:#eee!important}.item-active .item-title,#noteItemList .item-active:hover .item-title{color:#fff}#noteItemList .item-thumb{width:100px;overflow:hidden;position:absolute;z-index:1;right:0;height:100px;background-color:#fff;margin-right:5px;line-height:100px;text-align:center}.item-thumb img{max-width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;top:1px;padding:3px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-blog:hover{opacity:.8}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitleDiv{height:30px;border-bottom:1px solid #ddd}#noteTitle{height:100%;padding:0 3px;width:100%;border:0;background-color:#fff}#noteTitle:focus{outline:none!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}#editor,#mdEditor{position:absolute;z-index:2;top:71px;bottom:0;right:0;left:5px;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;border-bottom:1px solid #ccc;background-color:#f0f0f0}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fff}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;padding-left:5px;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right{padding:0 5px}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#leanoteMsg{line-height:40px;margin-top:10px;margin-left:10px}#newNoteWrap{line-height:40px;margin-top:10px}#loading{display:inline-block;width:20px;height:20px;content:url(../../images/loading-a-20.gif);vertical-align:middle;visibility:hidden}#toggleEditorMode{margin:0 10px!important}#upload{position:absolute;z-index:0;bottom:0;right:0;left:0;padding:0;background-color:#fff;text-align:center;display:none}#upload #drop{width:100%;height:100%;padding-top:100px}#drop.in{border:1px solid #000}#drop.hover{border:2px solid #000}#uploadMsg{position:absolute;top:3px;right:3px;bottom:10px;overflow:scroll;list-style:none}
+=======
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}@font-face{font-family:'leanoteregular';src:url('../../fonts/leanote/leanote-regular-webfont.eot');src:url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'),url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'),url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');font-weight:normal;font-style:normal}#logo{font-family:"leanoteregular";font-size:36px}#logo:before{content:"a"}#switcher span{font-family:"leanoteregular";border-radius:5px;display:inline-block;cursor:pointer;font-size:18px;height:34px;line-height:34px;margin-top:8px;padding:0 5px}#switcher span:before{content:"b"}.dropdown-menu{border-radius:3px;margin:0;border:1px solid #0fb264;box-shadow:rgba(0,0,0,0.172549) 0 6px 12px 0}.dropdown-menu li{list-style:none;padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu li>a{color:#000;display:block;padding-right:20px}.dropdown-menu>li>a{padding:3px 20px 3px 0}#notebookNavForNewNote li:hover{background:0}#noteList{position:absolute;bottom:0;top:0}.dropdown-submenu{position:relative}.dropdown-submenu>ul.dropdown-menu{top:0;left:100%;margin-left:-3px!important;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;padding-top:10px!important}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu:after{display:block;content:" ";position:absolute;right:0;top:10px;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#666}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.open>.dropdown-menu,.dropdown-submenu:hover>.dropdown-menu{-webkit-transform:scale(1,1);transform:scale(1,1)}.dropdown-menu{-webkit-transform-origin:left;transform-origin:top;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;-webkit-transform:scale(0,0);display:block;transition:all .2s cubic-bezier(0.34,1.21,0.4,1);-webkit-transition:all .2s cubic-bezier(0.34,1.21,0.4,1)}.dropdown-list{width:530px;border-radius:3px}.dropdown-list ul{margin:0;padding:0}.dropdown-list ul li{float:left;width:120px;margin-left:10px;margin-bottom:10px;border:1px dashed #ccc}.new-note-right{padding:0 5px;padding-left:3px}#leanoteMsg{line-height:40px;margin-top:10px;margin-left:10px}#newNoteWrap{line-height:40px;margin-top:10px}#searchNotebookForAddDropdownList{left:-200px}#searchNotebookForAdd{line-height:normal;width:200px;margin:0 10px;margin-bottom:10px;height:30px;border-color:#ebeff2;box-shadow:none}#myNotebooks .folderBody{padding-top:3px}#searchNotebookForList{height:30px;width:90%;margin:3px auto;margin-top:0;border-color:#ebeff2;box-shadow:none}#noteItemList .item-setting,#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;padding:3px;border-radius:5px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-setting .fa,#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-setting:hover,#noteItemList .item-blog:hover{opacity:.8}#noteItemList .item-blog{top:1px}#noteItemList .item-setting{bottom:0;display:none}#noteItemList .item:hover .item-setting{display:block}.friend-header{position:relative}.friend-header .notebook-setting{display:none}.friend-header:hover .notebook-setting{display:block}.each-user{margin-bottom:5px;margin-left:5px;margin-right:5px;margin-top:3px;border:1px solid #eee;border-radius:3px}.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}#myTag .folderBody{padding:0 3px;padding-bottom:3px}#myTag .folderBody li{float:left;padding:3px;line-height:normal}#notebookList{border-top:1px solid rgba(255,255,255,0.05)}.ztree{padding:0}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:14px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#25313e;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header a{color:#ccc}#header li{color:#000}#header li a{color:#000}#logo,#logo span{line-height:50px}#logo{width:140px;height:59px;padding-left:10px;padding-top:0;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.1)}#logo span{background-color:#000;border-radius:10px;display:inline-block;padding:4px 0;line-height:1.0}#switcher{line-height:50px;padding-top:6px;padding-right:5px;width:30px;text-align:center}#switcher i{font-size:16px;cursor:pointer}#switcher i:hover{color:#0fb264}#switcher span{border-radius:5px;background-color:#000;cursor:pointer;font-size:18px}#switcher span:hover{color:#0fb264}#searchNote{padding-left:0;line-height:60px;margin:0}#searchNote input{background-size:18px 13px;border-color:#ebeff2;border:0;color:#ccc;background-color:#000;padding-left:14px;border-radius:5px;width:250px;line-height:20px;box-shadow:none}#searchNote input:focus{outline:none!important;border-color:#0fb264;box-shadow:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border:1px solid #0fb264}.dropdown-menu li>a{color:#000}.dropdown-menu li:hover,.dropdown-menu li:focus{background-color:#ebeff2}.dropdown-menu li>a:hover,.dropdown-menu li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:59px;left:0;right:0;bottom:0;overflow:auto;zoom:1}#mainMask{position:absolute;left:0;right:0;bottom:0;top:0;background-color:#fff;text-align:center;padding-top:100px;z-index:1000}.noteSplit{position:absolute;top:0;width:5px;height:100%;overflow:hidden;z-index:5;cursor:col-resize}#notebookSplitter{left:170px}#noteSplitter{left:250px}#leftNotebook{position:absolute;left:0;top:0;bottom:0;width:170px}#notebook,#notebookMin{position:absolute;left:0;bottom:0;top:0;right:0;background-color:#41586e;z-index:2}#notebookMin{z-index:1;overflow-y:visible;overflow-x:visible;background-color:#41586e}#notebookMin div.minContainer{border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.3);padding:5px;position:relative;cursor:pointer}#notebookMin div.minContainer i{font-size:20px;color:#fff}#notebookMin div.minContainer:hover i{color:#0fb264}#notebookMin div.minContainer ul{background-color:#fff;opacity:.8;display:none;list-style:none;margin:0;margin-left:20px;padding:5px 0;border:1px solid #0fb264;position:absolute;z-index:1000;top:0;left:10px;width:150px}#notebookMin div.minContainer ul li{padding:0 5px;cursor:pointer}#notebookMin div.minContainer ul li span{cursor:pointer}#notebookMin div.minContainer ul li a{cursor:pointer}#notebookBottom{position:absolute;bottom:0;height:30px;right:0;left:0;line-height:30px;text-align:right;padding-right:5px;background-color:#eee}#notebookBottom #leftSwitcher{border:1px solid #ccc;padding:3px 8px;cursor:pointer}#noteAndEditor{position:absolute;bottom:0;top:0;right:0;left:170px}#noteList{width:250px;border-right:1px solid #cfcfcf;border-left:1px solid #cfcfcf}#note{position:absolute;bottom:0;top:0;left:250px;right:0;padding-left:5px;overflow-y:hidden;overflow-x:auto;background-color:#fff}.folderHeader{min-height:35px;line-height:35px;cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.05)}.folderHeader span{display:inline-block;line-height:35px;color:#fff;font-size:16px}.folderHeader .fa-left,.friend-header i.fa{display:inline-block;line-height:35px;font-size:16px;width:35px;border-right:1px solid rgba(255,255,255,0.05);text-align:center;color:#fff}.each-user div{cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.05)}.each-user div span{display:inline-block;line-height:35px;color:#fff;padding-left:3px;font-size:14px}.each-user div .fa{width:20px;border-right:0}#addNotebookPlus{padding-right:10px;color:#adbece}#addNotebookPlus .fa{font-size:16px}.closed .folder-icon{width:9px;height:11px;background-position:-108px -149px}.closed .folderBody{display:none}.folderBody{list-style:none;margin:0;padding:0;background-color:#37485e}.folderBody li{line-height:30px}.ztree>li{border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.05)}.ztree li a.curSelectedNode{background-color:rgba(0,0,0,0.3);border-radius:3px;color:#fff}.ztree li a{color:#adbece}.folderBody a:hover,.folderBody .contextmenu-hover{color:#fff;background-color:rgba(0,0,0,0.1)!important}.folderBody a.active,.folderBody a.active:hover{background-color:#25313e!important;color:#fff}#notebookList input,#notebookListForSearch input{border:1px solid rgba(0,0,0,0.1);width:90%;padding-left:3px;box-shadow:none;background:0;color:#fff}#notebookList input:focus,#notebookListForSearch input:focus{outline:none!important}#myTag .folderBody li{position:relative}#myTag .folderBody li .badge{width:40px;position:absolute;right:3px;top:7px;font-weight:normal;background-color:#fff;color:#000;border:1px solid #ebeff2}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#eee;border-bottom:1px solid #ebeff2}#sortType{float:right}#noteItemList{position:absolute;left:0;right:0;bottom:0;top:0;width:100%;overflow-y:hidden;background-color:#f7f7f7;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important;color:#000}.item-active,#noteItemList .item-active:hover{background-color:#65bd77!important;color:#fff}.item-active .item-desc .fa,#noteItemList .item-active:hover .item-desc .fa{color:#eee!important}.item-active .item-title,#noteItemList .item-active:hover .item-title{color:#fff}#noteItemList .item-thumb{width:100px;overflow:hidden;position:absolute;z-index:1;right:0;height:100px;background-color:#fff;margin-right:5px;line-height:100px;text-align:center}.item-thumb img{max-width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitleDiv{height:30px;border-bottom:1px solid #ddd}#noteTitle{height:100%;padding:0 3px;width:100%;border:0;background-color:#fff}#noteTitle:focus{outline:none!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}#editor,#mdEditor{position:absolute;z-index:2;top:71px;bottom:0;right:0;left:5px;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;border-bottom:1px solid #ccc;background-color:#f0f0f0}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fff}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;padding-left:5px;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#loading{display:inline-block;width:20px;height:20px;content:url(../../images/loading-a-20.gif);vertical-align:middle;visibility:hidden}#toggleEditorMode{margin:0 10px!important}#upload{position:absolute;z-index:0;bottom:0;right:0;left:0;padding:0;background-color:#fff;text-align:center;display:none}#upload #drop{width:100%;height:100%;padding-top:100px}#drop.in{border:1px solid #000}#drop.hover{border:2px solid #000}#uploadMsg{position:absolute;top:3px;right:3px;bottom:10px;overflow:scroll;list-style:none}#searchNotebookForList{color:#ccc;border:1px solid rgba(255,255,255,0.1);background-color:#37485e}#searchNotebookForList:focus{outline:none!important;border:1px solid rgba(255,255,255,0.3);box-shadow:none}.label-default{background-color:#191d2b}.each-user{border:1px solid rgba(0,0,0,0.09);background-color:#37485e}#myShareNotebooks .folderBody{background:0}.tmpzTreeMove_arrow{color:#fff}.ztree li a.tmpTargetNode_inner{padding-top:0;background-color:rgba(0,0,0,0.3);color:#fff;height:30px;border:1px #ccc solid;opacity:.8;filter:alpha(opacity=80)}
+>>>>>>> develop
diff --git a/public/css/theme/default.less b/public/css/theme/default.less
index 6a5f3e3..0784909 100644
--- a/public/css/theme/default.less
+++ b/public/css/theme/default.less
@@ -111,7 +111,7 @@ a.raw:hover {
border-radius: 5px;
background-color: #000;
cursor: pointer;
- font-size: 16px;
+ font-size: 18px;
&:hover {
color: @hColor;
}
@@ -169,29 +169,15 @@ a.raw:hover {
}
.dropdown-menu {
- border-radius: 0;
- margin:0;
- -webkit-box-shadow: none;
- box-shadow: none;
border: 1px solid @hColor;
- overflow-x: hidden;
- overflow-y: auto;
}
-.dropdown-menu li {
- padding-left: 10px;
- width: 100%;
- height: 30px; // 父设置了line-height, 子下拉也受影响, "新建笔记"
- line-height: 30px;
-}
-.dropdown-menu > li > a {
+.dropdown-menu li > a {
color: @aBlackColor;
- display: inline-block;
- padding: 3px 3px;
}
-.dropdown-menu>li:hover, .dropdown-menu>li:focus {
+.dropdown-menu li:hover, .dropdown-menu li:focus {
background-color: @borderColor;
}
-.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+.dropdown-menu li > a:hover, .dropdown-menu li > a:focus {
background-color: @borderColor;
}
@@ -291,6 +277,7 @@ a.raw:hover {
border-color: rgba(255, 255, 255, 0.3);
padding: 5px;
position: relative;
+ cursor: pointer;
i {
font-size: 20px;
color: #fff;
@@ -353,13 +340,7 @@ a.raw:hover {
left: @leftNotebookWidth;
}
#noteList {
- position: absolute;
- bottom: 0;
- top: 0;
width: @noteListWidth;
-
- overflow-x: hidden;
- overflow-y: hidden;
border-right: 1px solid #cfcfcf;
border-left: 1px solid #cfcfcf;
}
@@ -391,14 +372,14 @@ a.raw:hover {
color: #fff; // @hColor;
font-size: 16px;
}
-.folderHeader .fa-left, .each-user .fa {
+.folderHeader .fa-left, .friend-header i.fa {
display: inline-block;
- line-height: @folderHeaderHeight;
- font-size: 16px;
- width: @folderHeaderHeight;
- border-right: 1px solid rgba(255,255,255,0.05);
- text-align: center;
- color: #fff; // @hColor;
+ line-height: @folderHeaderHeight;
+ font-size: 16px;
+ width: @folderHeaderHeight;
+ border-right: 1px solid rgba(255,255,255,0.05);
+ text-align: center;
+ color: #fff; // @hColor;
}
.each-user div {
@@ -417,15 +398,6 @@ a.raw:hover {
border-right: none;
}
}
-.each-user ul {
- list-style: none;
- margin: 0;
- padding:0;
- a {
- padding-left: 20px;
- font-size: 12px;
- }
-}
#myNotebooks.opened .fa-left {
/*
@@ -455,28 +427,32 @@ a.raw:hover {
.closed .folderBody {
display: none;
}
+@leftBgColor: #37485e;
.folderBody {
list-style: none;
margin: 0;
padding: 0;
- background-color: #37485e;
+ background-color: @leftBgColor;
}
+
.folderBody li {
line-height: 30px;
}
-.folderBody a {
- padding-left: 20px;
- display: block;
- color: #ADBECE;
- cursor: pointer;
+.ztree > li {
border-bottom: 1px solid transparent;
border-color: rgba(255,255,255,0.05);
- line-height: 35px;
+}
+.ztree li a.curSelectedNode {
+ background-color: rgba(0,0,0,0.3);
+ border-radius: 3px;
+ color: #fff;
+}
+.ztree li a {
+ color: #ADBECE;
}
.folderBody a:hover, .folderBody .contextmenu-hover {
-// background-color: @borderColor !important;
color: #fff;
- background-color: rgba(0,0,0,0.05) !important;
+ background-color: rgba(0,0,0,0.1) !important;
}
.folderBody a.active, .folderBody a.active:hover {
background-color: #25313e !important; // @bgColor;
@@ -484,13 +460,15 @@ a.raw:hover {
}
// 重命名, 添加notebook
-#notebookList input {
- border: 1px solid @borderColor;
+#notebookList input, #notebookListForSearch input {
+ border: 1px solid rgba(0,0,0,0.1);
width: 90%;
+ padding-left:3px;
box-shadow: none;
+ background: none;
+ color: #fff;
&:focus {
outline: none !important;
- border-color: @hColor;
}
}
@@ -636,26 +614,7 @@ a.raw:hover {
color: #666;
}
}
-// blog
-#noteItemList .item-blog {
- position: absolute;
- right: 1px;
- font-size: 10px;
- z-index: 2;
- top: 1px;
- padding: 3px;
- cursor: pointer;
- .fa {
- color: #fff !important;
- }
- width: 20px;
- text-align: center;
- opacity: 0.5;
- &:hover {
- opacity: 0.8;
- }
- background-color: #464C5E;
-}
+
.item-title {
/*font-weight: 400;*/
font-size: 16px;
@@ -1149,7 +1108,6 @@ background-position:-1px -670px
}
}
.new-note-right {
- padding: 0 5px;
&:hover {
background-color:@borderColor;
}
@@ -1165,12 +1123,7 @@ background-position:-1px -670px
padding: 5px 0;
}
}
-#leanoteMsg {
- line-height: 40px; margin-top: 10px; margin-left: 10px;
-}
-#newNoteWrap {
- line-height: 40px; margin-top: 10px;
-}
+
#loading {
display: inline-block;
width: 20px;
@@ -1214,4 +1167,39 @@ background-position:-1px -670px
bottom: 10px;
overflow: scroll;
list-style: none;
+}
+
+//----------------------
+#searchNotebookForList {
+ color: #ccc;
+ border: 1px solid rgba(255, 255, 255, 0.1);
+ background-color: @leftBgColor;
+ &:focus {
+ outline: none !important;
+ border: 1px solid rgba(255, 255, 255, 0.3);
+ box-shadow: none;
+ }
+}
+.label-default {
+ background-color: #191D2B;
+}
+.each-user {
+ border: 1px solid rgba(0, 0, 0, 0.09);
+ background-color: @leftBgColor;
+}
+#myShareNotebooks .folderBody {
+ background: none;
+}
+.tmpzTreeMove_arrow {
+ color: #fff;
+}
+
+.ztree li a.tmpTargetNode_inner {
+ padding-top:0px;
+ background-color: rgba(0, 0, 0, 0.3);
+ color: #fff;
+ height: 30px;
+ border:1px #ccc solid;
+ opacity: 0.8;
+ filter:alpha(opacity=80)
}
\ No newline at end of file
diff --git a/public/css/theme/simple.css b/public/css/theme/simple.css
index f8043bb..cba624b 100644
--- a/public/css/theme/simple.css
+++ b/public/css/theme/simple.css
@@ -1 +1,5 @@
-@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}@font-face{font-family:'leanoteregular';src:url('../../fonts/leanote/leanote-regular-webfont.eot');src:url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'),url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'),url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');font-weight:normal;font-style:normal}#logo{font-family:"leanoteregular";font-size:36px}#logo:before{content:"a"}#switcher span{font-family:"leanoteregular";border-radius:5px;display:inline-block;cursor:pointer;font-size:18px;height:34px;line-height:34px;margin-top:8px;padding:0 5px}#switcher span:before{content:"b"}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:14px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#fff;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header{color:#000}#logo,#logo span{line-height:50px}#logo{width:140px;height:60px;padding-left:10px;padding-top:0;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.1)}#logo span{background-color:#000;color:#fff;border-radius:10px;display:inline-block;padding:4px 0;line-height:1.0}#switcher{line-height:50px;padding-top:6px;padding-right:5px;width:30px;text-align:center}#switcher i{font-size:16px;cursor:pointer}#switcher i:hover{color:#0fb264}#switcher span{background-color:#000;color:#fff;border-radius:5px;cursor:pointer;font-size:14px}#switcher span:hover{color:#0fb264}#searchNote{padding-left:0;line-height:60px;margin:0}#searchNote input{background-size:18px 13px;border-color:#ebeff2;padding-left:14px;height:30px;width:250px;line-height:20px;box-shadow:none}#searchNote input:focus{outline:none!important;border-color:#0fb264;box-shadow:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border-radius:0;margin:0;-webkit-box-shadow:none;box-shadow:none;border:1px solid #0fb264;overflow-x:hidden;overflow-y:auto}.dropdown-menu li{padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu>li>a{color:#000;display:inline-block;padding:3px 3px}.dropdown-menu>li:hover,.dropdown-menu>li:focus{background-color:#ebeff2}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:60px;left:0;right:0;bottom:0;overflow:auto;zoom:1}#mainMask{position:absolute;left:0;right:0;bottom:0;top:0;background-color:#fff;text-align:center;padding-top:100px;z-index:1000}.noteSplit{position:absolute;top:0;width:5px;height:100%;overflow:hidden;z-index:5;cursor:col-resize}#notebookSplitter{left:170px}#noteSplitter{left:250px}#leftNotebook{position:absolute;left:0;top:0;bottom:0;width:170px}#notebook,#notebookMin{position:absolute;left:0;bottom:0;top:0;right:0;background-color:#fff;overflow-y:auto;overflow-x:auto;z-index:2}#notebookMin{z-index:1;overflow-y:visible;overflow-x:visible;background-color:#eee}#notebookMin div.minContainer{border-bottom:1px solid #ccc;padding:5px;position:relative}#notebookMin div.minContainer i{font-size:20px;color:#000}#notebookMin div.minContainer:hover i{color:#0fb264}#notebookMin div.minContainer ul{background-color:#fff;opacity:.8;display:none;list-style:none;margin:0;margin-left:20px;padding:5px 0;border:1px solid #0fb264;position:absolute;z-index:1000;top:0;left:10px;width:150px}#notebookMin div.minContainer ul li{padding:0 5px;cursor:pointer}#notebookMin div.minContainer ul li span{cursor:pointer}#notebookMin div.minContainer ul li a{cursor:pointer}#notebookBottom{position:absolute;bottom:0;height:30px;right:0;left:0;line-height:30px;text-align:right;padding-right:5px;background-color:#eee}#notebookBottom #leftSwitcher{border:1px solid #ccc;padding:3px 8px;cursor:pointer}#noteAndEditor{position:absolute;bottom:0;top:0;right:0;left:170px}#noteList{position:absolute;bottom:0;top:0;width:250px;overflow-x:hidden;overflow-y:hidden;border-right:1px solid #ebeff2;border-left:1px solid #ebeff2}#note{position:absolute;bottom:0;top:0;left:250px;right:0;padding-left:5px;overflow-y:hidden;overflow-x:auto;background-color:#fff}.folderHeader{min-height:35px;line-height:35px;cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(0,0,0,0.05)}.folderHeader span{display:inline-block;line-height:35px;color:#000;font-size:16px}.folderHeader .fa-left,.each-user .fa{display:inline-block;line-height:35px;font-size:16px;width:35px;border-right:1px solid rgba(0,0,0,0.05);text-align:center;color:#000}.each-user div{cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(0,0,0,0.05)}.each-user div span{display:inline-block;line-height:35px;color:#000;padding-left:3px;font-size:14px}.each-user div .fa{width:20px;border-right:0}.each-user ul{list-style:none;margin:0;padding:0}.each-user ul a{padding-left:20px;font-size:12px}#addNotebookPlus{padding-right:10px;color:#666}#addNotebookPlus .fa{font-size:16px}.closed .folder-icon{width:9px;height:11px;background-position:-108px -149px}.closed .folderBody{display:none}.folderBody{list-style:none;margin:0;padding:0}.folderBody li{line-height:30px}.folderBody a.active{background-color:#fff;color:#0fb264}.folderBody a{padding-left:20px;display:block;color:#444;cursor:pointer}.folderBody a:hover,.folderBody .contextmenu-hover{background-color:#ebeff2!important}#notebookList input{border:1px solid #ebeff2;width:90%;box-shadow:none}#notebookList input:focus{outline:none!important;border-color:#0fb264}#myTag .folderBody li{position:relative}#myTag .folderBody li .badge{width:40px;position:absolute;right:3px;top:7px;font-weight:normal;background-color:#fff;color:#000;border:1px solid #ebeff2}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#fff;border-bottom:1px solid #ebeff2}#sortType{float:right}#noteItemList{position:absolute;top:0;left:0;right:0;bottom:0;width:100%;overflow-y:hidden;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important}.item-active,#noteItemList .item-active:hover{background-color:#65bd77!important;color:#fff}.item-active .fa,#noteItemList .item-active:hover .fa{color:#eee!important}.item-active .item-title,#noteItemList .item-active:hover .item-title{color:#fff}#noteItemList .item-thumb{width:100px;overflow:hidden;position:absolute;z-index:1;right:0;height:100px;background-color:#fff;margin-right:5px;line-height:100px;text-align:center}.item-thumb img{max-width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;top:1px;padding:3px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-blog:hover{opacity:.8}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitleDiv{height:30px;border-bottom:1px solid #ddd}#noteTitle{height:100%;padding:0 3px;width:100%;border:0;background-color:#fff;min-width:300px}#noteTitle:focus{outline:none!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}#editor,#mdEditor{position:absolute;z-index:2;top:71px;bottom:0;right:0;left:5px;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;border-bottom:1px solid #ccc;background-color:#f0f0f0}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fff}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right{padding:0 5px}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#leanoteMsg{line-height:40px;margin-top:10px;margin-left:10px}#newNoteWrap{line-height:40px;margin-top:10px}#loading{display:inline-block;width:20px;height:20px;content:url(../../images/loading-a-20-black.gif);vertical-align:middle;visibility:hidden}#toggleEditorMode{margin:0 10px!important}#upload{position:absolute;z-index:0;bottom:0;right:0;left:0;padding:0;background-color:#fff;text-align:center;display:none}#upload #drop{width:100%;height:100%;padding-top:100px}#drop.in{border:1px solid #000}#drop.hover{border:2px solid #000}#uploadMsg{position:absolute;top:3px;right:3px;bottom:10px;overflow:scroll;list-style:none}
\ No newline at end of file
+<<<<<<< HEAD
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}@font-face{font-family:'leanoteregular';src:url('../../fonts/leanote/leanote-regular-webfont.eot');src:url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'),url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'),url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');font-weight:normal;font-style:normal}#logo{font-family:"leanoteregular";font-size:36px}#logo:before{content:"a"}#switcher span{font-family:"leanoteregular";border-radius:5px;display:inline-block;cursor:pointer;font-size:18px;height:34px;line-height:34px;margin-top:8px;padding:0 5px}#switcher span:before{content:"b"}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:14px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#fff;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header{color:#000}#logo,#logo span{line-height:50px}#logo{width:140px;height:60px;padding-left:10px;padding-top:0;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.1)}#logo span{background-color:#000;color:#fff;border-radius:10px;display:inline-block;padding:4px 0;line-height:1.0}#switcher{line-height:50px;padding-top:6px;padding-right:5px;width:30px;text-align:center}#switcher i{font-size:16px;cursor:pointer}#switcher i:hover{color:#0fb264}#switcher span{background-color:#000;color:#fff;border-radius:5px;cursor:pointer;font-size:14px}#switcher span:hover{color:#0fb264}#searchNote{padding-left:0;line-height:60px;margin:0}#searchNote input{background-size:18px 13px;border-color:#ebeff2;padding-left:14px;height:30px;width:250px;line-height:20px;box-shadow:none}#searchNote input:focus{outline:none!important;border-color:#0fb264;box-shadow:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border-radius:0;margin:0;-webkit-box-shadow:none;box-shadow:none;border:1px solid #0fb264;overflow-x:hidden;overflow-y:auto}.dropdown-menu li{padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu>li>a{color:#000;display:inline-block;padding:3px 3px}.dropdown-menu>li:hover,.dropdown-menu>li:focus{background-color:#ebeff2}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:60px;left:0;right:0;bottom:0;overflow:auto;zoom:1}#mainMask{position:absolute;left:0;right:0;bottom:0;top:0;background-color:#fff;text-align:center;padding-top:100px;z-index:1000}.noteSplit{position:absolute;top:0;width:5px;height:100%;overflow:hidden;z-index:5;cursor:col-resize}#notebookSplitter{left:170px}#noteSplitter{left:250px}#leftNotebook{position:absolute;left:0;top:0;bottom:0;width:170px}#notebook,#notebookMin{position:absolute;left:0;bottom:0;top:0;right:0;background-color:#fff;overflow-y:auto;overflow-x:auto;z-index:2}#notebookMin{z-index:1;overflow-y:visible;overflow-x:visible;background-color:#eee}#notebookMin div.minContainer{border-bottom:1px solid #ccc;padding:5px;position:relative}#notebookMin div.minContainer i{font-size:20px;color:#000}#notebookMin div.minContainer:hover i{color:#0fb264}#notebookMin div.minContainer ul{background-color:#fff;opacity:.8;display:none;list-style:none;margin:0;margin-left:20px;padding:5px 0;border:1px solid #0fb264;position:absolute;z-index:1000;top:0;left:10px;width:150px}#notebookMin div.minContainer ul li{padding:0 5px;cursor:pointer}#notebookMin div.minContainer ul li span{cursor:pointer}#notebookMin div.minContainer ul li a{cursor:pointer}#notebookBottom{position:absolute;bottom:0;height:30px;right:0;left:0;line-height:30px;text-align:right;padding-right:5px;background-color:#eee}#notebookBottom #leftSwitcher{border:1px solid #ccc;padding:3px 8px;cursor:pointer}#noteAndEditor{position:absolute;bottom:0;top:0;right:0;left:170px}#noteList{position:absolute;bottom:0;top:0;width:250px;overflow-x:hidden;overflow-y:hidden;border-right:1px solid #ebeff2;border-left:1px solid #ebeff2}#note{position:absolute;bottom:0;top:0;left:250px;right:0;padding-left:5px;overflow-y:hidden;overflow-x:auto;background-color:#fff}.folderHeader{min-height:35px;line-height:35px;cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(0,0,0,0.05)}.folderHeader span{display:inline-block;line-height:35px;color:#000;font-size:16px}.folderHeader .fa-left,.each-user .fa{display:inline-block;line-height:35px;font-size:16px;width:35px;border-right:1px solid rgba(0,0,0,0.05);text-align:center;color:#000}.each-user div{cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(0,0,0,0.05)}.each-user div span{display:inline-block;line-height:35px;color:#000;padding-left:3px;font-size:14px}.each-user div .fa{width:20px;border-right:0}.each-user ul{list-style:none;margin:0;padding:0}.each-user ul a{padding-left:20px;font-size:12px}#addNotebookPlus{padding-right:10px;color:#666}#addNotebookPlus .fa{font-size:16px}.closed .folder-icon{width:9px;height:11px;background-position:-108px -149px}.closed .folderBody{display:none}.folderBody{list-style:none;margin:0;padding:0}.folderBody li{line-height:30px}.folderBody a.active{background-color:#fff;color:#0fb264}.folderBody a{padding-left:20px;display:block;color:#444;cursor:pointer}.folderBody a:hover,.folderBody .contextmenu-hover{background-color:#ebeff2!important}#notebookList input{border:1px solid #ebeff2;width:90%;box-shadow:none}#notebookList input:focus{outline:none!important;border-color:#0fb264}#myTag .folderBody li{position:relative}#myTag .folderBody li .badge{width:40px;position:absolute;right:3px;top:7px;font-weight:normal;background-color:#fff;color:#000;border:1px solid #ebeff2}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#fff;border-bottom:1px solid #ebeff2}#sortType{float:right}#noteItemList{position:absolute;top:0;left:0;right:0;bottom:0;width:100%;overflow-y:hidden;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important}.item-active,#noteItemList .item-active:hover{background-color:#65bd77!important;color:#fff}.item-active .fa,#noteItemList .item-active:hover .fa{color:#eee!important}.item-active .item-title,#noteItemList .item-active:hover .item-title{color:#fff}#noteItemList .item-thumb{width:100px;overflow:hidden;position:absolute;z-index:1;right:0;height:100px;background-color:#fff;margin-right:5px;line-height:100px;text-align:center}.item-thumb img{max-width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;top:1px;padding:3px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-blog:hover{opacity:.8}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitleDiv{height:30px;border-bottom:1px solid #ddd}#noteTitle{height:100%;padding:0 3px;width:100%;border:0;background-color:#fff;min-width:300px}#noteTitle:focus{outline:none!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}#editor,#mdEditor{position:absolute;z-index:2;top:71px;bottom:0;right:0;left:5px;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;border-bottom:1px solid #ccc;background-color:#f0f0f0}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fff}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right{padding:0 5px}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#leanoteMsg{line-height:40px;margin-top:10px;margin-left:10px}#newNoteWrap{line-height:40px;margin-top:10px}#loading{display:inline-block;width:20px;height:20px;content:url(../../images/loading-a-20-black.gif);vertical-align:middle;visibility:hidden}#toggleEditorMode{margin:0 10px!important}#upload{position:absolute;z-index:0;bottom:0;right:0;left:0;padding:0;background-color:#fff;text-align:center;display:none}#upload #drop{width:100%;height:100%;padding-top:100px}#drop.in{border:1px solid #000}#drop.hover{border:2px solid #000}#uploadMsg{position:absolute;top:3px;right:3px;bottom:10px;overflow:scroll;list-style:none}
+=======
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}@font-face{font-family:'leanoteregular';src:url('../../fonts/leanote/leanote-regular-webfont.eot');src:url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'),url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'),url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');font-weight:normal;font-style:normal}#logo{font-family:"leanoteregular";font-size:36px}#logo:before{content:"a"}#switcher span{font-family:"leanoteregular";border-radius:5px;display:inline-block;cursor:pointer;font-size:18px;height:34px;line-height:34px;margin-top:8px;padding:0 5px}#switcher span:before{content:"b"}.dropdown-menu{border-radius:3px;margin:0;border:1px solid #0fb264;box-shadow:rgba(0,0,0,0.172549) 0 6px 12px 0}.dropdown-menu li{list-style:none;padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu li>a{color:#000;display:block;padding-right:20px}.dropdown-menu>li>a{padding:3px 20px 3px 0}#notebookNavForNewNote li:hover{background:0}#noteList{position:absolute;bottom:0;top:0}.dropdown-submenu{position:relative}.dropdown-submenu>ul.dropdown-menu{top:0;left:100%;margin-left:-3px!important;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;padding-top:10px!important}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu:after{display:block;content:" ";position:absolute;right:0;top:10px;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#666}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.open>.dropdown-menu,.dropdown-submenu:hover>.dropdown-menu{-webkit-transform:scale(1,1);transform:scale(1,1)}.dropdown-menu{-webkit-transform-origin:left;transform-origin:top;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;-webkit-transform:scale(0,0);display:block;transition:all .2s cubic-bezier(0.34,1.21,0.4,1);-webkit-transition:all .2s cubic-bezier(0.34,1.21,0.4,1)}.dropdown-list{width:530px;border-radius:3px}.dropdown-list ul{margin:0;padding:0}.dropdown-list ul li{float:left;width:120px;margin-left:10px;margin-bottom:10px;border:1px dashed #ccc}.new-note-right{padding:0 5px;padding-left:3px}#leanoteMsg{line-height:40px;margin-top:10px;margin-left:10px}#newNoteWrap{line-height:40px;margin-top:10px}#searchNotebookForAddDropdownList{left:-200px}#searchNotebookForAdd{line-height:normal;width:200px;margin:0 10px;margin-bottom:10px;height:30px;border-color:#ebeff2;box-shadow:none}#myNotebooks .folderBody{padding-top:3px}#searchNotebookForList{height:30px;width:90%;margin:3px auto;margin-top:0;border-color:#ebeff2;box-shadow:none}#noteItemList .item-setting,#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;padding:3px;border-radius:5px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-setting .fa,#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-setting:hover,#noteItemList .item-blog:hover{opacity:.8}#noteItemList .item-blog{top:1px}#noteItemList .item-setting{bottom:0;display:none}#noteItemList .item:hover .item-setting{display:block}.friend-header{position:relative}.friend-header .notebook-setting{display:none}.friend-header:hover .notebook-setting{display:block}.each-user{margin-bottom:5px;margin-left:5px;margin-right:5px;margin-top:3px;border:1px solid #eee;border-radius:3px}.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}#myTag .folderBody{padding:0 3px;padding-bottom:3px}#myTag .folderBody li{float:left;padding:3px;line-height:normal}#notebookList{border-top:1px solid rgba(255,255,255,0.05)}.ztree{padding:0}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:14px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#fff;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header{color:#000}#logo,#logo span{line-height:50px}#logo{width:140px;height:60px;padding-left:10px;padding-top:0;border-bottom:1px solid transparent;border-color:rgba(255,255,255,0.1)}#logo span{background-color:#000;color:#fff;border-radius:10px;display:inline-block;padding:4px 0;line-height:1.0}#switcher{line-height:50px;padding-top:6px;padding-right:5px;width:30px;text-align:center}#switcher i{font-size:16px;cursor:pointer}#switcher i:hover{color:#0fb264}#switcher span{border-radius:5px;cursor:pointer;font-size:18px}#switcher span:hover{color:#0fb264}#searchNote{padding-left:0;line-height:60px;margin:0}#searchNote input{background-size:18px 13px;border-color:#ebeff2;padding-left:14px;height:30px;width:250px;line-height:20px;box-shadow:none}#searchNote input:focus{outline:none!important;border-color:#0fb264;box-shadow:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border:1px solid #0fb264}.dropdown-menu li>a{color:#000}.dropdown-menu li:hover,.dropdown-menu li:focus{background-color:#ebeff2}.dropdown-menu li>a:hover,.dropdown-menu li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:60px;left:0;right:0;bottom:0;overflow:auto;zoom:1}#mainMask{position:absolute;left:0;right:0;bottom:0;top:0;background-color:#fff;text-align:center;padding-top:100px;z-index:1000}.noteSplit{position:absolute;top:0;width:5px;height:100%;overflow:hidden;z-index:5;cursor:col-resize}#notebookSplitter{left:170px}#noteSplitter{left:250px}#leftNotebook{position:absolute;left:0;top:0;bottom:0;width:170px}#notebook,#notebookMin{position:absolute;left:0;bottom:0;top:0;right:0;background-color:#fff;overflow-y:auto;overflow-x:auto;z-index:2}#notebookMin{z-index:1;overflow-y:visible;overflow-x:visible;background-color:#eee}#notebookMin div.minContainer{border-bottom:1px solid #ccc;padding:5px;position:relative;cursor:pointer}#notebookMin div.minContainer i{font-size:20px;color:#000}#notebookMin div.minContainer:hover i{color:#0fb264}#notebookMin div.minContainer ul{background-color:#fff;opacity:.8;display:none;list-style:none;margin:0;margin-left:20px;padding:5px 0;border:1px solid #0fb264;position:absolute;z-index:1000;top:0;left:10px;width:150px}#notebookMin div.minContainer ul li{padding:0 5px;cursor:pointer}#notebookMin div.minContainer ul li span{cursor:pointer}#notebookMin div.minContainer ul li a{cursor:pointer}#notebookBottom{position:absolute;bottom:0;height:30px;right:0;left:0;line-height:30px;text-align:right;padding-right:5px;background-color:#eee}#notebookBottom #leftSwitcher{border:1px solid #ccc;padding:3px 8px;cursor:pointer}#noteAndEditor{position:absolute;bottom:0;top:0;right:0;left:170px}#noteList{width:250px;border-right:1px solid #ebeff2;border-left:1px solid #ebeff2}#note{position:absolute;bottom:0;top:0;left:250px;right:0;padding-left:5px;overflow-y:hidden;overflow-x:auto;background-color:#fff}.folderHeader{min-height:35px;line-height:35px;cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(0,0,0,0.05)}.folderHeader span{display:inline-block;line-height:35px;color:#000;font-size:16px}.folderHeader .fa-left,.friend-header i.fa{display:inline-block;line-height:35px;font-size:16px;width:35px;border-right:1px solid rgba(0,0,0,0.05);text-align:center;color:#000}.each-user div{cursor:pointer;border-bottom:1px solid transparent;border-color:rgba(0,0,0,0.05)}.each-user div span{display:inline-block;line-height:35px;color:#000;padding-left:3px;font-size:14px}.each-user div .fa{width:20px;border-right:0}#addNotebookPlus{padding-right:10px;color:#666}#addNotebookPlus .fa{font-size:16px}.closed .folder-icon{width:9px;height:11px;background-position:-108px -149px}.closed .folderBody{display:none}.folderBody{list-style:none;margin:0;padding:0}.folderBody li{line-height:30px}.folderBody a.active{background-color:#fff;color:#0fb264}.folderBody a:hover,.folderBody .contextmenu-hover{background-color:#ebeff2!important}#notebookList input,#notebookListForSearch input{width:90%;border:0;box-shadow:none;padding-left:3px;background:0}#notebookList input:focus,#notebookListForSearch input:focus{outline:none!important;border:0}#myTag .folderBody li{position:relative}#myTag .folderBody li .badge{width:40px;position:absolute;right:3px;top:7px;font-weight:normal;background-color:#fff;color:#000;border:1px solid #ebeff2}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#fff;border-bottom:1px solid #ebeff2}#sortType{float:right}#noteItemList{position:absolute;top:0;left:0;right:0;bottom:0;width:100%;overflow-y:hidden;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important}.item-active,#noteItemList .item-active:hover{background-color:#65bd77!important;color:#fff}.item-active .fa,#noteItemList .item-active:hover .fa{color:#eee!important}.item-active .item-title,#noteItemList .item-active:hover .item-title{color:#fff}#noteItemList .item-thumb{width:100px;overflow:hidden;position:absolute;z-index:1;right:0;height:100px;background-color:#fff;margin-right:5px;line-height:100px;text-align:center}.item-thumb img{max-width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitleDiv{height:30px;border-bottom:1px solid #ddd}#noteTitle{height:100%;padding:0 3px;width:100%;border:0;background-color:#fff;min-width:300px}#noteTitle:focus{outline:none!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}#editor,#mdEditor{position:absolute;z-index:2;top:71px;bottom:0;right:0;left:5px;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;border-bottom:1px solid #ccc;background-color:#f0f0f0}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fff}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#loading{display:inline-block;width:20px;height:20px;content:url(../../images/loading-a-20-black.gif);vertical-align:middle;visibility:hidden}#toggleEditorMode{margin:0 10px!important}#upload{position:absolute;z-index:0;bottom:0;right:0;left:0;padding:0;background-color:#fff;text-align:center;display:none}#upload #drop{width:100%;height:100%;padding-top:100px}#drop.in{border:1px solid #000}#drop.hover{border:2px solid #000}#uploadMsg{position:absolute;top:3px;right:3px;bottom:10px;overflow:scroll;list-style:none}#notebookList{border-top:1px dashed #eee}
+>>>>>>> develop
diff --git a/public/css/theme/simple.less b/public/css/theme/simple.less
index 16874fe..abf6842 100644
--- a/public/css/theme/simple.less
+++ b/public/css/theme/simple.less
@@ -101,11 +101,9 @@ a.raw:hover {
}
}
span {
- background-color: #000;
- color: #fff;
border-radius: 5px;
cursor: pointer;
- font-size: 14px;
+ font-size: 18px;
&:hover {
color: @hColor;
}
@@ -160,29 +158,15 @@ a.raw:hover {
}
.dropdown-menu {
- border-radius: 0;
- margin:0;
- -webkit-box-shadow: none;
- box-shadow: none;
border: 1px solid @hColor;
- overflow-x: hidden;
- overflow-y: auto;
}
-.dropdown-menu li {
- padding-left: 10px;
- width: 100%;
- height: 30px; // 父设置了line-height, 子下拉也受影响, "新建笔记"
- line-height: 30px;
-}
-.dropdown-menu > li > a {
+.dropdown-menu li > a {
color: @aBlackColor;
- display: inline-block;
- padding: 3px 3px;
}
-.dropdown-menu>li:hover, .dropdown-menu>li:focus {
+.dropdown-menu li:hover, .dropdown-menu li:focus {
background-color: @borderColor;
}
-.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+.dropdown-menu li > a:hover, .dropdown-menu li > a:focus {
background-color: @borderColor;
}
@@ -278,6 +262,7 @@ a.raw:hover {
border-bottom: 1px solid #ccc;
padding: 5px;
position: relative;
+ cursor: pointer;
i {
font-size: 20px;
color: #000;
@@ -342,12 +327,7 @@ a.raw:hover {
}
#noteList {
- position: absolute;
- bottom: 0;
- top: 0;
width: @noteListWidth;
- overflow-x: hidden;
- overflow-y: hidden;
border-right: 1px solid @borderColor;
border-left: 1px solid @borderColor;
}
@@ -380,7 +360,7 @@ a.raw:hover {
color: #000; // @hColor;
font-size: 16px;
}
-.folderHeader .fa-left, .each-user .fa {
+.folderHeader .fa-left, .friend-header i.fa {
display: inline-block;
line-height: @folderHeaderHeight;
font-size: 16px;
@@ -406,15 +386,6 @@ a.raw:hover {
border-right: none;
}
}
-.each-user ul {
- list-style: none;
- margin: 0;
- padding:0;
- a {
- padding-left: 20px;
- font-size: 12px;
- }
-}
#myNotebooks.opened .fa-left {
/*
@@ -451,24 +422,21 @@ a.raw:hover {
background-color: @bgColor;
color: @hColor;
}
-.folderBody a {
- padding-left: 20px;
- display: block;
- color: #444;
- cursor: pointer;
-}
+
.folderBody a:hover, .folderBody .contextmenu-hover {
background-color: @borderColor !important;
}
// 重命名, 添加notebook
-#notebookList input {
- border: 1px solid @borderColor;
+#notebookList input, #notebookListForSearch input {
width: 90%;
+ border: none;
box-shadow: none;
+ padding-left:3px;
+ background: none;
&:focus {
outline: none !important;
- border-color: @hColor;
+ border: none;
}
}
@@ -602,26 +570,7 @@ border: 1px solid @borderColor;
color: #666;
}
}
-// blog
-#noteItemList .item-blog {
- position: absolute;
- right: 1px;
- font-size: 10px;
- z-index: 2;
- top: 1px;
- padding: 3px;
- cursor: pointer;
- .fa {
- color: #fff !important;
- }
- width: 20px;
- text-align: center;
- opacity: 0.5;
- &:hover {
- opacity: 0.8;
- }
- background-color: #464C5E;
-}
+
.item-title {
/*font-weight: 400;*/
font-size: 16px;
@@ -1108,7 +1057,6 @@ background-position:-1px -670px
}
}
.new-note-right {
- padding: 0 5px;
&:hover {
background-color:@borderColor;
}
@@ -1125,12 +1073,6 @@ background-position:-1px -670px
}
}
-#leanoteMsg {
- line-height: 40px; margin-top: 10px; margin-left: 10px;
-}
-#newNoteWrap {
- line-height: 40px; margin-top: 10px;
-}
#loading {
display: inline-block;
width: 20px;
@@ -1175,4 +1117,7 @@ background-position:-1px -670px
bottom: 10px;
overflow: scroll;
list-style: none;
+}
+#notebookList {
+ border-top: 1px dashed #eee;
}
\ No newline at end of file
diff --git a/public/css/theme/writting-overwrite.css b/public/css/theme/writting-overwrite.css
index c08f074..2232ddc 100644
--- a/public/css/theme/writting-overwrite.css
+++ b/public/css/theme/writting-overwrite.css
@@ -1 +1,5 @@
-@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}html,body{background-color:#fbfcf7}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:16px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#fbfcf7;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header a{color:#ccc}#header li{color:#000}#header li a{color:#000}#searchWrap,#logo,#switcher,#leftNotebook,.noteSplit{display:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border-radius:0;margin:0;-webkit-box-shadow:none;box-shadow:none;border:1px solid #0fb264;overflow-x:hidden;overflow-y:auto}.dropdown-menu li{padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu>li>a{color:#000;display:inline-block;padding:3px 3px}.dropdown-menu>li:hover,.dropdown-menu>li:focus{background-color:#ebeff2}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:0;left:0;right:0;bottom:0;overflow:auto;zoom:1}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#eee;border-bottom:1px solid #ebeff2}#noteItemList{position:absolute;left:0;right:0;bottom:0;top:0;width:100%;overflow-y:hidden;background-color:#f7f7f7;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important;color:#000}#noteItemList .item-thumb{padding-left:10px;width:100px;overflow:hidden;position:absolute;right:0;height:100px;background-color:#fff;margin-right:5px}.item-thumb img{width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;top:1px;padding:3px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-blog:hover{opacity:.8}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitle:focus{outline:none!important}#editor,#mdEditor{z-index:2;top:71px;bottom:0;right:0;left:0;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;background-color:#fbfcf7}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-btn{background-color:#fbfcf7!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{display:none;border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fbfcf7}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;padding-left:5px;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right{padding:0 5px}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#left-column{width:100%!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}html,body{background-color:#fbfcf7;overflow:hidden}#right-column,#newNoteMarkdownBtn,#newShareNoteMarkdownBtn,.new-split,#editorMask,#sortType,#myProfile,#demoRegister{display:none}#mainMask{position:absolute;left:0;right:0;bottom:0;top:0;background-color:#fbfcf7;text-align:center;padding-top:100px;z-index:1000}#header{position:absolute;left:0;right:0;z-index:1;color:#ccc}#header #leanoteMsg{position:absolute;width:700px;left:0;right:0;text-align:right;line-height:60px;margin:auto}#newNoteWrap{line-height:40px;margin-top:10px;margin-left:10px}#newNoteWrap,#topNav{opacity:0}#newNoteWrap:hover,#topNav:hover{opacity:1}#mainContainer{overflow-y:hidden}#newMyNote,#newSharedNote{position:relative}#newMyNote .dropdown-menu,#newSharedNote .dropdown-menu{left:0!important}#newMyNote .dropdown,#newSharedNote .dropdown{position:static}.dropdown-menu{border:1px solid #ccc;background-color:#fbfcf7}#note{position:absolute;width:700px;margin:auto;height:100%;left:0;right:0}#editor,#mdEditor{position:absolute;top:60px;z-index:2}#wmd-input{border:0;background-color:#fbfcf7;font-size:16px!important}#md-section-helper{display:none}#mdEditorPreview{top:43px!important}#mceToolbar,#wmd-button-bar{height:40px;padding:5px 0}.editorBg{height:3px;background:url(/images/editor/editor-shadow.png) no-repeat center bottom #f9faf4}.mce-btn-small i,.mce-menubtn.mce-btn-small span,.wmd-button>span{opacity:.85}.mce-ico{font-size:18px;line-height:18px;width:18px;height:18px}.tool-split{line-height:30px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:80px}.mce-menubtn.mce-btn-small span{font-size:16px}#editorContent_ifr html{border:none!important}#noteTop{position:absolute;z-index:2;left:0;right:150px;padding:15px 0;height:59px}#noteTitleDiv{height:30px}#noteTitle{height:100%;padding:0 3px;width:100%;border:0;background-color:#fbfcf7}#noteList{position:fixed;top:0;bottom:0;left:10px;margin-top:60px;width:200px;z-index:0;opacity:.8;overflow-x:hidden;overflow-y:hidden}#noteList #notesAndSort{display:none}#noteList #noteItemListWrap{display:none}#notesAndSort{background:0}#noteItemList{background:0}#noteItemList .item{background:0}.item-active,#noteItemList .item-active:hover{background-color:#f5f8ea!important;color:#000}.item-active .item-desc .fa,#noteItemList .item-active:hover .item-desc .fa{color:#666!important}.item-active .item-title,#noteItemList .item-active:hover .item-title{color:#000}#leanoteNav{background-color:#fbfcf7;opacity:.3;right:-30px}.new-note-right{padding:0 2px}#loading{display:inline-block;width:20px;height:20px;content:url(../../images/loading-a-20-black.gif);margin-top:10px;visibility:hidden}#moreBtn{right:0!important}#toggleEditorMode{margin:0 10px!important}#upload{position:absolute;z-index:0;bottom:0;right:0;left:0;padding:0;background-color:#fff;text-align:center;display:none}#upload #drop{width:100%;height:100%;padding-top:100px}#drop.in{border:1px solid #000}#drop.hover{border:2px solid #000}#uploadMsg{position:absolute;top:3px;right:3px;bottom:10px;overflow:scroll;list-style:none}
\ No newline at end of file
+<<<<<<< HEAD
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}html,body{background-color:#fbfcf7}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:16px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#fbfcf7;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header a{color:#ccc}#header li{color:#000}#header li a{color:#000}#searchWrap,#logo,#switcher,#leftNotebook,.noteSplit{display:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border-radius:0;margin:0;-webkit-box-shadow:none;box-shadow:none;border:1px solid #0fb264;overflow-x:hidden;overflow-y:auto}.dropdown-menu li{padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu>li>a{color:#000;display:inline-block;padding:3px 3px}.dropdown-menu>li:hover,.dropdown-menu>li:focus{background-color:#ebeff2}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:0;left:0;right:0;bottom:0;overflow:auto;zoom:1}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#eee;border-bottom:1px solid #ebeff2}#noteItemList{position:absolute;left:0;right:0;bottom:0;top:0;width:100%;overflow-y:hidden;background-color:#f7f7f7;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important;color:#000}#noteItemList .item-thumb{padding-left:10px;width:100px;overflow:hidden;position:absolute;right:0;height:100px;background-color:#fff;margin-right:5px}.item-thumb img{width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;top:1px;padding:3px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-blog:hover{opacity:.8}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitle:focus{outline:none!important}#editor,#mdEditor{z-index:2;top:71px;bottom:0;right:0;left:0;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;background-color:#fbfcf7}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-btn{background-color:#fbfcf7!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{display:none;border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fbfcf7}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;padding-left:5px;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right{padding:0 5px}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#left-column{width:100%!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}html,body{background-color:#fbfcf7;overflow:hidden}#right-column,#newNoteMarkdownBtn,#newShareNoteMarkdownBtn,.new-split,#editorMask,#sortType,#myProfile,#demoRegister{display:none}#mainMask{position:absolute;left:0;right:0;bottom:0;top:0;background-color:#fbfcf7;text-align:center;padding-top:100px;z-index:1000}#header{position:absolute;left:0;right:0;z-index:1;color:#ccc}#header #leanoteMsg{position:absolute;width:700px;left:0;right:0;text-align:right;line-height:60px;margin:auto}#newNoteWrap{line-height:40px;margin-top:10px;margin-left:10px}#newNoteWrap,#topNav{opacity:0}#newNoteWrap:hover,#topNav:hover{opacity:1}#mainContainer{overflow-y:hidden}#newMyNote,#newSharedNote{position:relative}#newMyNote .dropdown-menu,#newSharedNote .dropdown-menu{left:0!important}#newMyNote .dropdown,#newSharedNote .dropdown{position:static}.dropdown-menu{border:1px solid #ccc;background-color:#fbfcf7}#note{position:absolute;width:700px;margin:auto;height:100%;left:0;right:0}#editor,#mdEditor{position:absolute;top:60px;z-index:2}#wmd-input{border:0;background-color:#fbfcf7;font-size:16px!important}#md-section-helper{display:none}#mdEditorPreview{top:43px!important}#mceToolbar,#wmd-button-bar{height:40px;padding:5px 0}.editorBg{height:3px;background:url(/images/editor/editor-shadow.png) no-repeat center bottom #f9faf4}.mce-btn-small i,.mce-menubtn.mce-btn-small span,.wmd-button>span{opacity:.85}.mce-ico{font-size:18px;line-height:18px;width:18px;height:18px}.tool-split{line-height:30px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:80px}.mce-menubtn.mce-btn-small span{font-size:16px}#editorContent_ifr html{border:none!important}#noteTop{position:absolute;z-index:2;left:0;right:150px;padding:15px 0;height:59px}#noteTitleDiv{height:30px}#noteTitle{height:100%;padding:0 3px;width:100%;border:0;background-color:#fbfcf7}#noteList{position:fixed;top:0;bottom:0;left:10px;margin-top:60px;width:200px;z-index:0;opacity:.8;overflow-x:hidden;overflow-y:hidden}#noteList #notesAndSort{display:none}#noteList #noteItemListWrap{display:none}#notesAndSort{background:0}#noteItemList{background:0}#noteItemList .item{background:0}.item-active,#noteItemList .item-active:hover{background-color:#f5f8ea!important;color:#000}.item-active .item-desc .fa,#noteItemList .item-active:hover .item-desc .fa{color:#666!important}.item-active .item-title,#noteItemList .item-active:hover .item-title{color:#000}#leanoteNav{background-color:#fbfcf7;opacity:.3;right:-30px}.new-note-right{padding:0 2px}#loading{display:inline-block;width:20px;height:20px;content:url(../../images/loading-a-20-black.gif);margin-top:10px;visibility:hidden}#moreBtn{right:0!important}#toggleEditorMode{margin:0 10px!important}#upload{position:absolute;z-index:0;bottom:0;right:0;left:0;padding:0;background-color:#fff;text-align:center;display:none}#upload #drop{width:100%;height:100%;padding-top:100px}#drop.in{border:1px solid #000}#drop.hover{border:2px solid #000}#uploadMsg{position:absolute;top:3px;right:3px;bottom:10px;overflow:scroll;list-style:none}
+=======
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}@font-face{font-family:'leanoteregular';src:url('../../fonts/leanote/leanote-regular-webfont.eot');src:url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'),url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'),url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');font-weight:normal;font-style:normal}#logo{font-family:"leanoteregular";font-size:36px}#logo:before{content:"a"}#switcher span{font-family:"leanoteregular";border-radius:5px;display:inline-block;cursor:pointer;font-size:18px;height:34px;line-height:34px;margin-top:8px;padding:0 5px}#switcher span:before{content:"b"}.dropdown-menu{border-radius:3px;margin:0;border:1px solid #0fb264;box-shadow:rgba(0,0,0,0.172549) 0 6px 12px 0}.dropdown-menu li{list-style:none;padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu li>a{color:#000;display:block;padding-right:20px}.dropdown-menu>li>a{padding:3px 20px 3px 0}#notebookNavForNewNote li:hover{background:0}#noteList{position:absolute;bottom:0;top:0}.dropdown-submenu{position:relative}.dropdown-submenu>ul.dropdown-menu{top:0;left:100%;margin-left:-3px!important;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;padding-top:10px!important}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu:after{display:block;content:" ";position:absolute;right:0;top:10px;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#666}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.open>.dropdown-menu,.dropdown-submenu:hover>.dropdown-menu{-webkit-transform:scale(1,1);transform:scale(1,1)}.dropdown-menu{-webkit-transform-origin:left;transform-origin:top;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;-webkit-transform:scale(0,0);display:block;transition:all .2s cubic-bezier(0.34,1.21,0.4,1);-webkit-transition:all .2s cubic-bezier(0.34,1.21,0.4,1)}.dropdown-list{width:530px;border-radius:3px}.dropdown-list ul{margin:0;padding:0}.dropdown-list ul li{float:left;width:120px;margin-left:10px;margin-bottom:10px;border:1px dashed #ccc}.new-note-right{padding:0 5px;padding-left:3px}#leanoteMsg{line-height:40px;margin-top:10px;margin-left:10px}#newNoteWrap{line-height:40px;margin-top:10px}#searchNotebookForAddDropdownList{left:-200px}#searchNotebookForAdd{line-height:normal;width:200px;margin:0 10px;margin-bottom:10px;height:30px;border-color:#ebeff2;box-shadow:none}#myNotebooks .folderBody{padding-top:3px}#searchNotebookForList{height:30px;width:90%;margin:3px auto;margin-top:0;border-color:#ebeff2;box-shadow:none}#noteItemList .item-setting,#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;padding:3px;border-radius:5px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-setting .fa,#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-setting:hover,#noteItemList .item-blog:hover{opacity:.8}#noteItemList .item-blog{top:1px}#noteItemList .item-setting{bottom:0;display:none}#noteItemList .item:hover .item-setting{display:block}.friend-header{position:relative}.friend-header .notebook-setting{display:none}.friend-header:hover .notebook-setting{display:block}.each-user{margin-bottom:5px;margin-left:5px;margin-right:5px;margin-top:3px;border:1px solid #eee;border-radius:3px}.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}#myTag .folderBody{padding:0 3px;padding-bottom:3px}#myTag .folderBody li{float:left;padding:3px;line-height:normal}#notebookList{border-top:1px solid rgba(255,255,255,0.05)}.ztree{padding:0}@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}html,body{background-color:#fbfcf7}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:16px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#fbfcf7;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header a{color:#ccc}#header li{color:#000}#header li a{color:#000}#searchWrap,#logo,#switcher,#leftNotebook,.noteSplit{display:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border-radius:0;margin:0;-webkit-box-shadow:none;box-shadow:none;border:1px solid #0fb264;overflow:visible}.dropdown-menu li{padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu>li>a{color:#000;display:inline-block;padding:3px 3px}.dropdown-menu>li:hover,.dropdown-menu>li:focus{background-color:#ebeff2}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:0;left:0;right:0;bottom:0;overflow:auto;zoom:1}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#eee;border-bottom:1px solid #ebeff2}#noteItemList{position:absolute;left:0;right:0;bottom:0;top:0;width:100%;overflow-y:hidden;background-color:#f7f7f7;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important;color:#000}#noteItemList .item-thumb{padding-left:10px;width:100px;overflow:hidden;position:absolute;right:0;height:100px;background-color:#fff;margin-right:5px}.item-thumb img{width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;top:1px;padding:3px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-blog:hover{opacity:.8}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitle:focus{outline:none!important}#editor,#mdEditor{z-index:2;top:71px;bottom:0;right:0;left:0;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;background-color:#fbfcf7}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-btn{background-color:#fbfcf7!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{display:none;border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fbfcf7}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;padding-left:5px;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right{padding:0 5px}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#left-column{width:100%!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}html,body{background-color:#fbfcf7;overflow:hidden}#right-column,#newNoteMarkdownBtn,#newShareNoteMarkdownBtn,.new-split,#editorMask,#sortType,#myProfile,#demoRegister{display:none}#mainMask{position:absolute;left:0;right:0;bottom:0;top:0;background-color:#fbfcf7;text-align:center;padding-top:100px;z-index:1000}#header{position:absolute;left:0;right:0;z-index:333;color:#ccc}#header #leanoteMsg{position:absolute;width:700px;left:0;right:0;text-align:right;line-height:60px;margin:auto}#newNoteWrap{line-height:40px;margin-top:10px;margin-left:10px}#newNoteWrap,#topNav{opacity:0}#newNoteWrap:hover,#topNav:hover{opacity:1}#mainContainer{overflow-y:hidden}#newMyNote,#newSharedNote{position:relative}#newMyNote .dropdown,#newSharedNote .dropdown{position:static}.dropdown-menu{border:1px solid #ccc;background-color:#fbfcf7}#note{position:absolute;width:700px;margin:auto;height:100%;left:0;right:0}#editor,#mdEditor{position:absolute;top:60px;z-index:2}#wmd-input{border:0;background-color:#fbfcf7;font-size:16px!important}#md-section-helper{display:none}#mdEditorPreview{top:43px!important}#mceToolbar,#wmd-button-bar{height:40px;padding:5px 0}.editorBg{height:3px;background:url(/images/editor/editor-shadow.png) no-repeat center bottom #f9faf4}.mce-btn-small i,.mce-menubtn.mce-btn-small span,.wmd-button>span{opacity:.85}.mce-ico{font-size:18px;line-height:18px;width:18px;height:18px}.tool-split{line-height:30px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:80px}.mce-menubtn.mce-btn-small span{font-size:16px}#editorContent_ifr html{border:none!important}#noteTop{position:absolute;z-index:9999;left:0;right:150px;padding:15px 0;height:59px}#noteTitleDiv{height:30px}#noteTitle{height:100%;padding:0 3px;width:100%;border:0;background-color:#fbfcf7}#noteList{position:fixed;top:0;bottom:0;left:10px;margin-top:60px;width:200px;z-index:0;opacity:.8;overflow-x:hidden;overflow-y:hidden}#noteList #notesAndSort{display:none}#noteList #noteItemListWrap{display:none}#notesAndSort{background:0}#noteItemList{background:0}#noteItemList .item{background:0}.item-active,#noteItemList .item-active:hover{background-color:#f5f8ea!important;color:#000}.item-active .item-desc .fa,#noteItemList .item-active:hover .item-desc .fa{color:#666!important}.item-active .item-title,#noteItemList .item-active:hover .item-title{color:#000}#leanoteNav{background-color:#fbfcf7;opacity:.3;right:-30px}.new-note-right{padding:0 2px}#loading{display:inline-block;width:20px;height:20px;content:url(../../images/loading-a-20-black.gif);margin-top:10px;visibility:hidden}#moreBtn{right:0!important}#toggleEditorMode{margin:0 10px!important}#upload{position:absolute;z-index:0;bottom:0;right:0;left:0;padding:0;background-color:#fff;text-align:center;display:none}#upload #drop{width:100%;height:100%;padding-top:100px}#drop.in{border:1px solid #000}#drop.hover{border:2px solid #000}#uploadMsg{position:absolute;top:3px;right:3px;bottom:10px;overflow:scroll;list-style:none}#searchNotebookForAddDropdownList{left:0}#searchNotebookForAdd{background:0}
+>>>>>>> develop
diff --git a/public/css/theme/writting-overwrite.less b/public/css/theme/writting-overwrite.less
index 2ee3923..b1a1558 100644
--- a/public/css/theme/writting-overwrite.less
+++ b/public/css/theme/writting-overwrite.less
@@ -1,3 +1,4 @@
+@import "basic.less";
@bgColor: #fff;
@headerBgColor: #25313e;
@@ -151,8 +152,7 @@ a.raw:hover {
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid @hColor;
- overflow-x: hidden;
- overflow-y: auto;
+ overflow: visible;
}
.dropdown-menu li {
padding-left: 10px;
@@ -866,7 +866,7 @@ html,body {
position: absolute;
left:0;
right:0;
- z-index:1;
+ z-index:333;
#leanoteMsg {
position: absolute;
width: @editorWidth;
@@ -897,7 +897,6 @@ html,body {
#newMyNote, #newSharedNote {
position: relative;
.dropdown-menu {
- left: 0px !important;
}
.dropdown {
position: static;
@@ -966,7 +965,7 @@ html,body {
}
#noteTop{
position: absolute;
- z-index:2;
+ z-index:9999;
left:0;
right: 150px;
padding: 15px 0;
@@ -1090,4 +1089,11 @@ body {
bottom: 10px;
overflow: scroll;
list-style: none;
+}
+
+#searchNotebookForAddDropdownList {
+ left: 0;
+}
+#searchNotebookForAdd {
+ background: none;
}
\ No newline at end of file
diff --git a/public/css/theme/writting.css b/public/css/theme/writting.css
index d5f9214..c58a7c3 100644
--- a/public/css/theme/writting.css
+++ b/public/css/theme/writting.css
@@ -1 +1,5 @@
-@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}html,body{background-color:#fbfcf7}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:16px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#fbfcf7;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header a{color:#ccc}#header li{color:#000}#header li a{color:#000}#searchWrap,#logo,#switcher,#leftNotebook,.noteSplit{display:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border-radius:0;margin:0;-webkit-box-shadow:none;box-shadow:none;border:1px solid #0fb264;overflow-x:hidden;overflow-y:auto}.dropdown-menu li{padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu>li>a{color:#000;display:inline-block;padding:3px 3px}.dropdown-menu>li:hover,.dropdown-menu>li:focus{background-color:#ebeff2}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:0;left:0;right:0;bottom:0;overflow:auto;zoom:1}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#eee;border-bottom:1px solid #ebeff2}#noteItemList{position:absolute;left:0;right:0;bottom:0;top:0;width:100%;overflow-y:hidden;background-color:#f7f7f7;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important;color:#000}#noteItemList .item-thumb{padding-left:10px;width:100px;overflow:hidden;position:absolute;right:0;height:100px;background-color:#fff;margin-right:5px}.item-thumb img{width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;top:1px;padding:3px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-blog:hover{opacity:.8}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitle:focus{outline:none!important}#editor,#mdEditor{z-index:2;top:71px;bottom:0;right:0;left:0;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;background-color:#fbfcf7}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-btn{background-color:#fbfcf7!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{display:none;border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fbfcf7}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;padding-left:5px;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right{padding:0 5px}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#left-column{width:100%!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}
\ No newline at end of file
+<<<<<<< HEAD
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}html,body{background-color:#fbfcf7}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:16px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#fbfcf7;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header a{color:#ccc}#header li{color:#000}#header li a{color:#000}#searchWrap,#logo,#switcher,#leftNotebook,.noteSplit{display:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border-radius:0;margin:0;-webkit-box-shadow:none;box-shadow:none;border:1px solid #0fb264;overflow-x:hidden;overflow-y:auto}.dropdown-menu li{padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu>li>a{color:#000;display:inline-block;padding:3px 3px}.dropdown-menu>li:hover,.dropdown-menu>li:focus{background-color:#ebeff2}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:0;left:0;right:0;bottom:0;overflow:auto;zoom:1}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#eee;border-bottom:1px solid #ebeff2}#noteItemList{position:absolute;left:0;right:0;bottom:0;top:0;width:100%;overflow-y:hidden;background-color:#f7f7f7;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important;color:#000}#noteItemList .item-thumb{padding-left:10px;width:100px;overflow:hidden;position:absolute;right:0;height:100px;background-color:#fff;margin-right:5px}.item-thumb img{width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;top:1px;padding:3px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-blog:hover{opacity:.8}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitle:focus{outline:none!important}#editor,#mdEditor{z-index:2;top:71px;bottom:0;right:0;left:0;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;background-color:#fbfcf7}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-btn{background-color:#fbfcf7!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{display:none;border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fbfcf7}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;padding-left:5px;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right{padding:0 5px}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#left-column{width:100%!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}
+=======
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}@font-face{font-family:'leanoteregular';src:url('../../fonts/leanote/leanote-regular-webfont.eot');src:url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'),url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'),url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');font-weight:normal;font-style:normal}#logo{font-family:"leanoteregular";font-size:36px}#logo:before{content:"a"}#switcher span{font-family:"leanoteregular";border-radius:5px;display:inline-block;cursor:pointer;font-size:18px;height:34px;line-height:34px;margin-top:8px;padding:0 5px}#switcher span:before{content:"b"}.dropdown-menu{border-radius:3px;margin:0;border:1px solid #0fb264;box-shadow:rgba(0,0,0,0.172549) 0 6px 12px 0}.dropdown-menu li{list-style:none;padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu li>a{color:#000;display:block;padding-right:20px}.dropdown-menu>li>a{padding:3px 20px 3px 0}#notebookNavForNewNote li:hover{background:0}#noteList{position:absolute;bottom:0;top:0}.dropdown-submenu{position:relative}.dropdown-submenu>ul.dropdown-menu{top:0;left:100%;margin-left:-3px!important;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;padding-top:10px!important}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu:after{display:block;content:" ";position:absolute;right:0;top:10px;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#666}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.open>.dropdown-menu,.dropdown-submenu:hover>.dropdown-menu{-webkit-transform:scale(1,1);transform:scale(1,1)}.dropdown-menu{-webkit-transform-origin:left;transform-origin:top;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;-webkit-transform:scale(0,0);display:block;transition:all .2s cubic-bezier(0.34,1.21,0.4,1);-webkit-transition:all .2s cubic-bezier(0.34,1.21,0.4,1)}.dropdown-list{width:530px;border-radius:3px}.dropdown-list ul{margin:0;padding:0}.dropdown-list ul li{float:left;width:120px;margin-left:10px;margin-bottom:10px;border:1px dashed #ccc}.new-note-right{padding:0 5px;padding-left:3px}#leanoteMsg{line-height:40px;margin-top:10px;margin-left:10px}#newNoteWrap{line-height:40px;margin-top:10px}#searchNotebookForAddDropdownList{left:-200px}#searchNotebookForAdd{line-height:normal;width:200px;margin:0 10px;margin-bottom:10px;height:30px;border-color:#ebeff2;box-shadow:none}#myNotebooks .folderBody{padding-top:3px}#searchNotebookForList{height:30px;width:90%;margin:3px auto;margin-top:0;border-color:#ebeff2;box-shadow:none}#noteItemList .item-setting,#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;padding:3px;border-radius:5px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-setting .fa,#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-setting:hover,#noteItemList .item-blog:hover{opacity:.8}#noteItemList .item-blog{top:1px}#noteItemList .item-setting{bottom:0;display:none}#noteItemList .item:hover .item-setting{display:block}.friend-header{position:relative}.friend-header .notebook-setting{display:none}.friend-header:hover .notebook-setting{display:block}.each-user{margin-bottom:5px;margin-left:5px;margin-right:5px;margin-top:3px;border:1px solid #eee;border-radius:3px}.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}#myTag .folderBody{padding:0 3px;padding-bottom:3px}#myTag .folderBody li{float:left;padding:3px;line-height:normal}#notebookList{border-top:1px solid rgba(255,255,255,0.05)}.ztree{padding:0}@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff')}::selection{background:#000;color:#fff}::-moz-selection{background:#000;color:#fff}::-webkit-selection{background:#000;color:#fff}html,body{background-color:#fbfcf7}*,body{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300;font-size:16px}h1,h2,h3{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;font-weight:300!important}a{color:#000;cursor:pointer}a:hover{text-decoration:none!important;color:#000}a.raw{color:#428bca}a.raw:hover{color:#2a6496}#header{height:60px;background-color:#fbfcf7;color:#fff;border-bottom:1px solid #ebeff2;webkit-user-select:none;-webkit-app-region:drag}#header a{color:#ccc}#header li{color:#000}#header li a{color:#000}#searchWrap,#logo,#switcher,#leftNotebook,.noteSplit{display:none}#header ul{margin:0;padding:0;list-style:none}#header ul li.dropdown{display:inline-block;height:60px}#header ul>li>a.dropdown-toggle{display:block;padding:15px 5px 0 0;position:relative}#header span.icon{display:inline-block;font-size:28px;color:#999}.dropdown-menu{border-radius:0;margin:0;-webkit-box-shadow:none;box-shadow:none;border:1px solid #0fb264;overflow-x:hidden;overflow-y:auto}.dropdown-menu li{padding-left:10px;width:100%;height:30px;line-height:30px}.dropdown-menu>li>a{color:#000;display:inline-block;padding:3px 3px}.dropdown-menu>li:hover,.dropdown-menu>li:focus{background-color:#ebeff2}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#ebeff2}.ios7-a{display:inline-block;padding:0 10px 0 5px;height:40px;vertical-align:middle;line-height:38px;cursor:pointer}#page{overflow:auto;position:absolute;top:0;left:0;bottom:0;right:0}#pageInner{position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}#mainContainer{position:absolute;top:0;left:0;right:0;bottom:0;overflow:auto;zoom:1}#search{border:#bababa 1px solid;background-color:#fff;white-space:nowrap;position:absolute;height:30px;left:3px;right:60px;margin-top:3px}#search label{display:none}#searchButton{border:0 none;width:16px;height:16px;overflow:hidden;cursor:pointer;position:absolute;right:3px;top:5px}#searchInput{border:0 none;overflow:hidden;position:absolute;right:20px;left:0;padding-left:10px;height:28px}#searchInput:focus{border:0;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#notesAndSort{background-color:#eee;border-bottom:1px solid #ebeff2}#noteItemList{position:absolute;left:0;right:0;bottom:0;top:0;width:100%;overflow-y:hidden;background-color:#f7f7f7;padding:0 5px}#noteItemList .item{position:relative;height:110px;overflow:hidden;cursor:pointer;padding:5px;border:1px solid #ebeff2;border-radius:3px;margin-top:5px;background-color:#fff}#noteItemList .item:hover,#noteItemList .contextmenu-hover{background-color:#ddd!important;color:#000}#noteItemList .item-thumb{padding-left:10px;width:100px;overflow:hidden;position:absolute;right:0;height:100px;background-color:#fff;margin-right:5px}.item-thumb img{width:100px}#noteItemList .item-desc{position:absolute;left:0;right:100px;margin-left:4px}#noteItemList .item-desc .fa{color:#666}#noteItemList .item-blog{position:absolute;right:1px;font-size:10px;z-index:2;top:1px;padding:3px;cursor:pointer;width:20px;text-align:center;opacity:.5;background-color:#464c5e}#noteItemList .item-blog .fa{color:#fff!important}#noteItemList .item-blog:hover{opacity:.8}.item-title{font-size:16px;height:22px;line-height:20px;overflow:hidden;margin-bottom:0;color:#000;border-bottom:dashed 1px #ebeff2}#editorTool{margin:0;padding:0;list-style:none}#editorTool li{display:inline-block}#noteTitle:focus{outline:none!important}#editor,#mdEditor{z-index:2;top:71px;bottom:0;right:0;left:0;padding:0;display:none}#mdEditor{z-index:1;background-color:#fff;bottom:10px}#mdEditor #md-section-helper,#mdEditor #wmd-input{font-size:14px;line-height:22px}#editorContent{position:absolute;top:30px;bottom:10px;right:0;left:0;overflow:auto}#editor .mce-ifr{border:0;overflow:hidden!important}#editor .mce-tinymce{border:0}#mceToolbar,#wmd-button-bar{position:relative;height:30px;overflow:hidden;background-color:#fbfcf7}.mce-btn-small button{padding:5px 5px!important;line-height:20px!important}.mce-btn{background-color:#fbfcf7!important}.mce-menubtn.mce-btn-small span{line-height:20px!important}.mce-btn span{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif!important}.mce-primary button,.mce-primary button i{text-shadow:none}.mce-primary{background-color:#47a447!important;border-color:#398439!important}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{background-color:#ebeff2}.mce-menu-item:hover span,.mce-menu-item.mce-selected span,.mce-menu-item:focus span{color:#000!important}.mce-menu-item-normal.mce-active{background-color:#ebeff2}.tool-split{display:inline-block;line-height:25px;color:#ddd}#tool{display:none;border-bottom:1px solid #ddd}#tag{height:40px;line-height:38px}#tag .dropdown{line-height:30px}#addTagInput{line-height:25px;display:none;padding:0;border:0;background-color:#fbfcf7}#addTagInput:focus{outline:0}.label-default{background-color:#464c5e}.label-red{background-color:#d9534f}.label-yellow{background-color:#f0ad4e}.label-blue{background-color:#428bca}.label-green{background-color:#5cb85c}.label{border-radius:0;font-weight:normal}.label i{width:10px;cursor:pointer;font-style:normal;display:inline-block;padding-left:3px;opacity:0}.label i:hover{opacity:1}#leanoteNav{position:absolute;right:5px;border:1px solid #ccc;border-radius:3px;background-color:#fff;opacity:.5;z-index:11;margin-right:2px}#leanoteNav h1{margin:0;font-size:18px;padding:3px;cursor:pointer}#leanoteNav i{padding:3px}#leanoteNav span{display:none}#leanoteNav #leanoteNavContent{display:none;overflow:auto}#leanoteNav.unfolder{min-width:200px;max-width:300px;opacity:.8}#leanoteNav.unfolder h1{border-bottom:1px dashed #ebeff2}#leanoteNav.unfolder span{display:inline}#leanoteNav.unfolder #leanoteNavContent{display:block;min-height:30px}#leanoteNav ul{margin:0;padding-left:23px}#leanoteNav ul li{list-style-type:disc}#leanoteNav ul li a:hover{color:#0fb264}#leanoteNav ul .nav-h2{margin-left:20px}#leanoteNav ul .nav-h3{margin-left:30px}#leanoteNav ul .nav-h4{margin-left:40px}#leanoteNav ul .nav-h5{margin-left:50px}.scrollTo-a{cursor:pointer!important}#noteRead{position:absolute;left:0;right:0;top:0;bottom:0;display:none;z-index:100;padding-left:5px;background-color:#fff}#noteReadContainer{position:relative;width:100%;height:100%}#noteReadTop{position:absolute;height:60px;left:0;right:0;border-bottom:1px solid #ebeff2}#noteReadTitle{margin:3px 0}#noteReadContent{position:absolute;top:60px;bottom:0;right:0;left:0;overflow:auto;padding:3px}.fa-calendar{color:#666}.dropdown-menu .fa{width:15px}.dropdown-menu span,.dropdown-menu a,.dropdown-menu li{cursor:default}#topNav a{display:inline-block;line-height:60px}.tab-pane{padding:5px 0 0 0}.alert{margin-bottom:10px}.btn{border-radius:0!important}#notebookNavForNewNote li,#notebookNavForNewSharedNote>li{padding-left:0;border-bottom:1px solid #ebeff2}#notebookNavForNewNote>li:hover,#notebookNavForNewNote>li:focus,#notebookNavForNewSharedNote>li:hover,#notebookNavForNewSharedNote>li:focus{background:0}.new-note-left{padding:0 5px;width:95px;overflow:hidden;white-space:nowrap;border-right:1px dashed #ebeff2}.new-note-left:hover{background-color:#ebeff2}.new-note-right{padding:0 5px}.new-note-right:hover{background-color:#ebeff2}#historyList table{width:100%}#historyList .btns{border-top:1px dashed #eee;padding:5px 0}#left-column{width:100%!important}#editorMask{position:absolute;top:0;bottom:0;right:0;left:0;background-color:#fff;z-index:-10;padding-top:50px;text-align:center}#editorMask .fa,#editorMask a{font-size:24px}#editorMask a{display:inline-block;border-radius:3px;border:1px solid #ebeff2;padding:10px}#editorMask a:hover{background-color:#65bd77;color:#fff}
+>>>>>>> develop
diff --git a/public/css/theme/writting.less b/public/css/theme/writting.less
index dbc098d..7e75492 100644
--- a/public/css/theme/writting.less
+++ b/public/css/theme/writting.less
@@ -1,3 +1,4 @@
+@import "basic.less";
@bgColor: #fff;
@headerBgColor: #25313e;
diff --git a/public/css/zTreeStyle/img/diy/1_close.png b/public/css/zTreeStyle/img/diy/1_close.png
new file mode 100644
index 0000000..68ccb3c
Binary files /dev/null and b/public/css/zTreeStyle/img/diy/1_close.png differ
diff --git a/public/css/zTreeStyle/img/diy/1_open.png b/public/css/zTreeStyle/img/diy/1_open.png
new file mode 100644
index 0000000..d6ff36d
Binary files /dev/null and b/public/css/zTreeStyle/img/diy/1_open.png differ
diff --git a/public/css/zTreeStyle/img/diy/2.png b/public/css/zTreeStyle/img/diy/2.png
new file mode 100644
index 0000000..9eff506
Binary files /dev/null and b/public/css/zTreeStyle/img/diy/2.png differ
diff --git a/public/css/zTreeStyle/img/diy/3.png b/public/css/zTreeStyle/img/diy/3.png
new file mode 100644
index 0000000..d7ba6d0
Binary files /dev/null and b/public/css/zTreeStyle/img/diy/3.png differ
diff --git a/public/css/zTreeStyle/img/diy/4.png b/public/css/zTreeStyle/img/diy/4.png
new file mode 100644
index 0000000..753e2bf
Binary files /dev/null and b/public/css/zTreeStyle/img/diy/4.png differ
diff --git a/public/css/zTreeStyle/img/diy/5.png b/public/css/zTreeStyle/img/diy/5.png
new file mode 100644
index 0000000..0c5eccd
Binary files /dev/null and b/public/css/zTreeStyle/img/diy/5.png differ
diff --git a/public/css/zTreeStyle/img/diy/6.png b/public/css/zTreeStyle/img/diy/6.png
new file mode 100644
index 0000000..070b835
Binary files /dev/null and b/public/css/zTreeStyle/img/diy/6.png differ
diff --git a/public/css/zTreeStyle/img/diy/7.png b/public/css/zTreeStyle/img/diy/7.png
new file mode 100644
index 0000000..532b037
Binary files /dev/null and b/public/css/zTreeStyle/img/diy/7.png differ
diff --git a/public/css/zTreeStyle/img/diy/8.png b/public/css/zTreeStyle/img/diy/8.png
new file mode 100644
index 0000000..a8f3a86
Binary files /dev/null and b/public/css/zTreeStyle/img/diy/8.png differ
diff --git a/public/css/zTreeStyle/img/diy/9.png b/public/css/zTreeStyle/img/diy/9.png
new file mode 100644
index 0000000..4db73cd
Binary files /dev/null and b/public/css/zTreeStyle/img/diy/9.png differ
diff --git a/public/css/zTreeStyle/img/left_menuForOutLook.gif b/public/css/zTreeStyle/img/left_menuForOutLook.gif
new file mode 100644
index 0000000..c252f0f
Binary files /dev/null and b/public/css/zTreeStyle/img/left_menuForOutLook.gif differ
diff --git a/public/css/zTreeStyle/img/left_menuForOutLook.png b/public/css/zTreeStyle/img/left_menuForOutLook.png
new file mode 100644
index 0000000..36e8acf
Binary files /dev/null and b/public/css/zTreeStyle/img/left_menuForOutLook.png differ
diff --git a/public/css/zTreeStyle/img/line_conn.gif b/public/css/zTreeStyle/img/line_conn.gif
new file mode 100644
index 0000000..d561d36
Binary files /dev/null and b/public/css/zTreeStyle/img/line_conn.gif differ
diff --git a/public/css/zTreeStyle/img/loading.gif b/public/css/zTreeStyle/img/loading.gif
new file mode 100644
index 0000000..e8c2892
Binary files /dev/null and b/public/css/zTreeStyle/img/loading.gif differ
diff --git a/public/css/zTreeStyle/img/zTreeStandard.gif b/public/css/zTreeStyle/img/zTreeStandard.gif
new file mode 100644
index 0000000..50c94fd
Binary files /dev/null and b/public/css/zTreeStyle/img/zTreeStandard.gif differ
diff --git a/public/css/zTreeStyle/img/zTreeStandard.png b/public/css/zTreeStyle/img/zTreeStandard.png
new file mode 100644
index 0000000..ffda01e
Binary files /dev/null and b/public/css/zTreeStyle/img/zTreeStandard.png differ
diff --git a/public/css/zTreeStyle/zTreeStyle.css b/public/css/zTreeStyle/zTreeStyle.css
new file mode 100644
index 0000000..19cdd6a
--- /dev/null
+++ b/public/css/zTreeStyle/zTreeStyle.css
@@ -0,0 +1,84 @@
+.ztree * {padding:0; margin:0; font-size:12px;}
+.ztree {margin:0; padding:5px; color:#333}
+.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 a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent;
+ text-decoration:none; vertical-align:top; display: block;
+ position: relative;
+}
+.ztree li a:hover {text-decoration:underline}
+.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+
+/* 拖动到上面 */
+.ztree li a.tmpTargetNode_inner {
+ padding-top:0px;
+ background-color:#eee;
+ color: #000;
+ height: 30px;
+ border:1px #ccc solid;
+ opacity: 0.8;
+ filter:alpha(opacity=80)
+}
+.ztree li span {line-height:16px; margin-right:2px}
+.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;}
+.ztree li span.button.switch {width:18px; height:18px}
+.ztree li span.button.ico_open{margin-right:2px; background-position:-110px -16px; vertical-align:top;
+}
+.ztree li span.button.ico_close{margin-right:2px; background-position:-110px 0; vertical-align:top; }
+.ztree li span.button.ico_docu{margin-right:2px; background-position:-110px -32px; vertical-align:top; }
+.ztree li span.button.edit {margin-right:2px; background-position:-110px -48px; vertical-align:top; }
+.ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; }
+
+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:0 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}
+.ztree li ul{ margin:0; padding:0}
+.ztree li {line-height:30px;}
+.ztree > li {
+ border-bottom: 1px dashed #eee;
+}
+.ztree li a {height:30px;padding-top: 0px;}
+.ztree li a:hover {text-decoration:none; background-color: #E7E7E7;}
+.ztree li a span.button.switch {visibility:hidden}
+.ztree.showIcon li a span.button.switch {visibility:visible}
+.ztree li a.curSelectedNode {background-color:#eee;border:0;height:30px;}
+.ztree li span {line-height:30px;}
+.ztree li span.button {margin-top: -5px;}
+.ztree li span.button.switch {width: 16px;height: 30px; line-height: 30px; text-align: center}
+
+.ztree li a.level0 span {font-size: 14px;}
+.ztree li span.button {
+ background-image: none;
+}
+.ztree li span.button.switch.level0 {width: 20px;}
+.ztree li span.button.switch.level1 {width: 20px;}
+.ztree li span.button.noline_open:before {
+ content: "\f107";
+}
+.ztree li span.button.noline_close:before {
+ content: "\f105";
+}
+.ztree li span.button.noline_open.level0 {background-position: 0 -18px;}
+.ztree li span.button.noline_close.level0 {background-position: -18px -18px;}
+
+/* life */
+.ztree .tree-title {
+ display: inline-block;
+}
\ No newline at end of file
diff --git a/public/js/all.js b/public/js/all.js
index 66bec02..ec7f077 100644
--- a/public/js/all.js
+++ b/public/js/all.js
@@ -1,2 +1,2 @@
(function(factory){if(typeof define==="function"&&define.amd){define(["jquery"],factory)}else{factory(jQuery)}})(function($){var pluses=/\+/g;function encode(s){return config.raw?s:encodeURIComponent(s)}function decode(s){return config.raw?s:decodeURIComponent(s)}function stringifyCookieValue(value){return encode(config.json?JSON.stringify(value):String(value))}function parseCookieValue(s){if(s.indexOf('"')===0){s=s.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\")}try{s=decodeURIComponent(s.replace(pluses," "));return config.json?JSON.parse(s):s}catch(e){}}function read(s,converter){var value=config.raw?s:parseCookieValue(s);return $.isFunction(converter)?converter(value):value}var config=$.cookie=function(key,value,options){if(value!==undefined&&!$.isFunction(value)){options=$.extend({},config.defaults,options);if(typeof options.expires==="number"){var days=options.expires,t=options.expires=new Date;t.setTime(+t+days*864e5)}return document.cookie=[encode(key),"=",stringifyCookieValue(value),options.expires?"; expires="+options.expires.toUTCString():"",options.path?"; path="+options.path:"",options.domain?"; domain="+options.domain:"",options.secure?"; secure":""].join("")}var result=key?undefined:{};var cookies=document.cookie?document.cookie.split("; "):[];for(var i=0,l=cookies.length;i
this.$items.length-1||pos<0)return;if(this.sliding)return this.$element.one("slid",function(){that.to(pos)});if(activeIndex==pos)return this.pause().cycle();return this.slide(pos>activeIndex?"next":"prev",$(this.$items[pos]))};Carousel.prototype.pause=function(e){e||(this.paused=true);if(this.$element.find(".next, .prev").length&&$.support.transition.end){this.$element.trigger($.support.transition.end);this.cycle(true)}this.interval=clearInterval(this.interval);return this};Carousel.prototype.next=function(){if(this.sliding)return;return this.slide("next")};Carousel.prototype.prev=function(){if(this.sliding)return;return this.slide("prev")};Carousel.prototype.slide=function(type,next){var $active=this.$element.find(".item.active");var $next=next||$active[type]();var isCycling=this.interval;var direction=type=="next"?"left":"right";var fallback=type=="next"?"first":"last";var that=this;if(!$next.length){if(!this.options.wrap)return;$next=this.$element.find(".item")[fallback]()}this.sliding=true;isCycling&&this.pause();var e=$.Event("slide.bs.carousel",{relatedTarget:$next[0],direction:direction});if($next.hasClass("active"))return;if(this.$indicators.length){this.$indicators.find(".active").removeClass("active");this.$element.one("slid",function(){var $nextIndicator=$(that.$indicators.children()[that.getActiveIndex()]);$nextIndicator&&$nextIndicator.addClass("active")})}if($.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(e);if(e.isDefaultPrevented())return;$next.addClass(type);$next[0].offsetWidth;$active.addClass(direction);$next.addClass(direction);$active.one($.support.transition.end,function(){$next.removeClass([type,direction].join(" ")).addClass("active");$active.removeClass(["active",direction].join(" "));that.sliding=false;setTimeout(function(){that.$element.trigger("slid")},0)}).emulateTransitionEnd(600)}else{this.$element.trigger(e);if(e.isDefaultPrevented())return;$active.removeClass("active");$next.addClass("active");this.sliding=false;this.$element.trigger("slid")}isCycling&&this.cycle();return this};var old=$.fn.carousel;$.fn.carousel=function(option){return this.each(function(){var $this=$(this);var data=$this.data("bs.carousel");var options=$.extend({},Carousel.DEFAULTS,$this.data(),typeof option=="object"&&option);var action=typeof option=="string"?option:options.slide;if(!data)$this.data("bs.carousel",data=new Carousel(this,options));if(typeof option=="number")data.to(option);else if(action)data[action]();else if(options.interval)data.pause().cycle()})};$.fn.carousel.Constructor=Carousel;$.fn.carousel.noConflict=function(){$.fn.carousel=old;return this};$(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(e){var $this=$(this),href;var $target=$($this.attr("data-target")||(href=$this.attr("href"))&&href.replace(/.*(?=#[^\s]+$)/,""));var options=$.extend({},$target.data(),$this.data());var slideIndex=$this.attr("data-slide-to");if(slideIndex)options.interval=false;$target.carousel(options);if(slideIndex=$this.attr("data-slide-to")){$target.data("bs.carousel").to(slideIndex)}e.preventDefault()});$(window).on("load",function(){$('[data-ride="carousel"]').each(function(){var $carousel=$(this);$carousel.carousel($carousel.data())})})}(jQuery);+function($){"use strict";var Collapse=function(element,options){this.$element=$(element);this.options=$.extend({},Collapse.DEFAULTS,options);this.transitioning=null;if(this.options.parent)this.$parent=$(this.options.parent);if(this.options.toggle)this.toggle()};Collapse.DEFAULTS={toggle:true};Collapse.prototype.dimension=function(){var hasWidth=this.$element.hasClass("width");return hasWidth?"width":"height"};Collapse.prototype.show=function(){if(this.transitioning||this.$element.hasClass("in"))return;var startEvent=$.Event("show.bs.collapse");this.$element.trigger(startEvent);if(startEvent.isDefaultPrevented())return;var actives=this.$parent&&this.$parent.find("> .panel > .in");if(actives&&actives.length){var hasData=actives.data("bs.collapse");if(hasData&&hasData.transitioning)return;actives.collapse("hide");hasData||actives.data("bs.collapse",null)}var dimension=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[dimension](0);this.transitioning=1;var complete=function(){this.$element.removeClass("collapsing").addClass("in")[dimension]("auto");this.transitioning=0;this.$element.trigger("shown.bs.collapse")};if(!$.support.transition)return complete.call(this);var scrollSize=$.camelCase(["scroll",dimension].join("-"));this.$element.one($.support.transition.end,$.proxy(complete,this)).emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize])};Collapse.prototype.hide=function(){if(this.transitioning||!this.$element.hasClass("in"))return;var startEvent=$.Event("hide.bs.collapse");this.$element.trigger(startEvent);if(startEvent.isDefaultPrevented())return;var dimension=this.dimension();this.$element[dimension](this.$element[dimension]())[0].offsetHeight;this.$element.addClass("collapsing").removeClass("collapse").removeClass("in");this.transitioning=1;var complete=function(){this.transitioning=0;this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};if(!$.support.transition)return complete.call(this);this.$element[dimension](0).one($.support.transition.end,$.proxy(complete,this)).emulateTransitionEnd(350)};Collapse.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var old=$.fn.collapse;$.fn.collapse=function(option){return this.each(function(){var $this=$(this);var data=$this.data("bs.collapse");var options=$.extend({},Collapse.DEFAULTS,$this.data(),typeof option=="object"&&option);if(!data)$this.data("bs.collapse",data=new Collapse(this,options));if(typeof option=="string")data[option]()})};$.fn.collapse.Constructor=Collapse;$.fn.collapse.noConflict=function(){$.fn.collapse=old;return this};$(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(e){var $this=$(this),href;var target=$this.attr("data-target")||e.preventDefault()||(href=$this.attr("href"))&&href.replace(/.*(?=#[^\s]+$)/,"");var $target=$(target);var data=$target.data("bs.collapse");var option=data?"toggle":$this.data();var parent=$this.attr("data-parent");var $parent=parent&&$(parent);if(!data||!data.transitioning){if($parent)$parent.find('[data-toggle=collapse][data-parent="'+parent+'"]').not($this).addClass("collapsed");$this[$target.hasClass("in")?"addClass":"removeClass"]("collapsed")}$target.collapse(option)})}(jQuery);+function($){"use strict";var backdrop=".dropdown-backdrop";var toggle="[data-toggle=dropdown]";var Dropdown=function(element){var $el=$(element).on("click.bs.dropdown",this.toggle)};Dropdown.prototype.toggle=function(e){var $this=$(this);if($this.is(".disabled, :disabled"))return;var $parent=getParent($this);var isActive=$parent.hasClass("open");clearMenus();if(!isActive){if("ontouchstart"in document.documentElement&&!$parent.closest(".navbar-nav").length){$('').insertAfter($(this)).on("click",clearMenus)}$parent.trigger(e=$.Event("show.bs.dropdown"));if(e.isDefaultPrevented())return;$parent.toggleClass("open").trigger("shown.bs.dropdown");$this.focus()}return false};Dropdown.prototype.keydown=function(e){if(!/(38|40|27)/.test(e.keyCode))return;var $this=$(this);e.preventDefault();e.stopPropagation();if($this.is(".disabled, :disabled"))return;var $parent=getParent($this);var isActive=$parent.hasClass("open");if(!isActive||isActive&&e.keyCode==27){if(e.which==27)$parent.find(toggle).focus();return $this.click()}var $items=$("[role=menu] li:not(.divider):visible a",$parent);if(!$items.length)return;var index=$items.index($items.filter(":focus"));if(e.keyCode==38&&index>0)index--;if(e.keyCode==40&&index<$items.length-1)index++;if(!~index)index=0;$items.eq(index).focus()};function clearMenus(){$(backdrop).remove();$(toggle).each(function(e){var $parent=getParent($(this));if(!$parent.hasClass("open"))return;$parent.trigger(e=$.Event("hide.bs.dropdown"));if(e.isDefaultPrevented())return;$parent.removeClass("open").trigger("hidden.bs.dropdown")})}function getParent($this){var selector=$this.attr("data-target");if(!selector){selector=$this.attr("href");selector=selector&&/#/.test(selector)&&selector.replace(/.*(?=#[^\s]*$)/,"")}var $parent=selector&&$(selector);return $parent&&$parent.length?$parent:$this.parent()}var old=$.fn.dropdown;$.fn.dropdown=function(option){return this.each(function(){var $this=$(this);var data=$this.data("dropdown");if(!data)$this.data("dropdown",data=new Dropdown(this));if(typeof option=="string")data[option].call($this)})};$.fn.dropdown.Constructor=Dropdown;$.fn.dropdown.noConflict=function(){$.fn.dropdown=old;return this};$(document).on("click.bs.dropdown.data-api",clearMenus).on("click.bs.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.bs.dropdown.data-api",toggle,Dropdown.prototype.toggle).on("keydown.bs.dropdown.data-api",toggle+", [role=menu]",Dropdown.prototype.keydown)}(jQuery);+function($){"use strict";var Modal=function(element,options){this.options=options;this.$element=$(element);this.$backdrop=this.isShown=null;if(this.options.remote){this.$element.load(this.options.remote)}};Modal.DEFAULTS={backdrop:true,keyboard:true,show:true};Modal.prototype.toggle=function(_relatedTarget){return this[!this.isShown?"show":"hide"](_relatedTarget)};Modal.prototype.show=function(_relatedTarget){var that=this;var e=$.Event("show.bs.modal",{relatedTarget:_relatedTarget});this.$element.trigger(e);if(this.isShown||e.isDefaultPrevented())return;this.isShown=true;this.escape();this.$element.on("click.dismiss.modal",'[data-dismiss="modal"]',$.proxy(this.hide,this));this.backdrop(function(){var transition=$.support.transition&&that.$element.hasClass("fade");if(!that.$element.parent().length){that.$element.appendTo(document.body)}that.$element.show();if(transition){that.$element[0].offsetWidth}that.$element.addClass("in").attr("aria-hidden",false);that.enforceFocus();var e=$.Event("shown.bs.modal",{relatedTarget:_relatedTarget});transition?that.$element.find(".modal-dialog").one($.support.transition.end,function(){that.$element.focus().trigger(e)}).emulateTransitionEnd(300):that.$element.focus().trigger(e)})};Modal.prototype.hide=function(e){if(e)e.preventDefault();e=$.Event("hide.bs.modal");this.$element.trigger(e);if(!this.isShown||e.isDefaultPrevented())return;this.isShown=false;this.escape();$(document).off("focusin.bs.modal");this.$element.removeClass("in").attr("aria-hidden",true).off("click.dismiss.modal");$.support.transition&&this.$element.hasClass("fade")?this.$element.one($.support.transition.end,$.proxy(this.hideModal,this)).emulateTransitionEnd(300):this.hideModal()};Modal.prototype.enforceFocus=function(){$(document).off("focusin.bs.modal").on("focusin.bs.modal",$.proxy(function(e){if(this.$element[0]!==e.target&&!this.$element.has(e.target).length){this.$element.focus()}},this))};Modal.prototype.escape=function(){if(this.isShown&&this.options.keyboard){this.$element.on("keyup.dismiss.bs.modal",$.proxy(function(e){e.which==27&&this.hide()},this))}else if(!this.isShown){this.$element.off("keyup.dismiss.bs.modal")}};Modal.prototype.hideModal=function(){var that=this;this.$element.hide();this.backdrop(function(){that.removeBackdrop();that.$element.trigger("hidden.bs.modal")})};Modal.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove();this.$backdrop=null};Modal.prototype.backdrop=function(callback){var that=this;var animate=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var doAnimate=$.support.transition&&animate;this.$backdrop=$('').appendTo(document.body);this.$element.on("click.dismiss.modal",$.proxy(function(e){if(e.target!==e.currentTarget)return;this.options.backdrop=="static"?this.$element[0].focus.call(this.$element[0]):this.hide.call(this)},this));if(doAnimate)this.$backdrop[0].offsetWidth;this.$backdrop.addClass("in");if(!callback)return;doAnimate?this.$backdrop.one($.support.transition.end,callback).emulateTransitionEnd(150):callback()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");$.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one($.support.transition.end,callback).emulateTransitionEnd(150):callback()}else if(callback){callback()}};var old=$.fn.modal;$.fn.modal=function(option,_relatedTarget){return this.each(function(){var $this=$(this);var data=$this.data("bs.modal");var options=$.extend({},Modal.DEFAULTS,$this.data(),typeof option=="object"&&option);if(options.remote){data=null}if(!data)$this.data("bs.modal",data=new Modal(this,options));if(typeof option=="string")data[option](_relatedTarget);else if(options.show)data.show(_relatedTarget);if(options.postShow){options.postShow();$this.find(".alert").hide()}})};$.fn.modal.Constructor=Modal;$.fn.modal.noConflict=function(){$.fn.modal=old;return this};$(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(e){var $this=$(this);var href=$this.attr("href");var $target=$($this.attr("data-target")||href&&href.replace(/.*(?=#[^\s]+$)/,""));var option=$target.data("modal")?"toggle":$.extend({remote:!/#/.test(href)&&href},$target.data(),$this.data());e.preventDefault();$target.modal(option,this).one("hide",function(){$this.is(":visible")&&$this.focus()})});$(document).on("show.bs.modal",".modal",function(){$(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){$(document.body).removeClass("modal-open")})}(jQuery);+function($){"use strict";var Tooltip=function(element,options){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null;this.init("tooltip",element,options)};Tooltip.DEFAULTS={animation:true,placement:"top",selector:false,template:'',trigger:"hover focus",title:"",delay:0,html:false,container:false};Tooltip.prototype.init=function(type,element,options){this.enabled=true;this.type=type;this.$element=$(element);this.options=this.getOptions(options);var triggers=this.options.trigger.split(" ");for(var i=triggers.length;i--;){var trigger=triggers[i];if(trigger=="click"){this.$element.on("click."+this.type,this.options.selector,$.proxy(this.toggle,this))}else if(trigger!="manual"){var eventIn=trigger=="hover"?"mouseenter":"focus";var eventOut=trigger=="hover"?"mouseleave":"blur";this.$element.on(eventIn+"."+this.type,this.options.selector,$.proxy(this.enter,this));this.$element.on(eventOut+"."+this.type,this.options.selector,$.proxy(this.leave,this))}}this.options.selector?this._options=$.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()};Tooltip.prototype.getDefaults=function(){return Tooltip.DEFAULTS};Tooltip.prototype.getOptions=function(options){options=$.extend({},this.getDefaults(),this.$element.data(),options);if(options.delay&&typeof options.delay=="number"){options.delay={show:options.delay,hide:options.delay}}return options};Tooltip.prototype.getDelegateOptions=function(){var options={};var defaults=this.getDefaults();this._options&&$.each(this._options,function(key,value){if(defaults[key]!=value)options[key]=value});return options};Tooltip.prototype.enter=function(obj){var self=obj instanceof this.constructor?obj:$(obj.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);clearTimeout(self.timeout);self.hoverState="in";if(!self.options.delay||!self.options.delay.show)return self.show();self.timeout=setTimeout(function(){if(self.hoverState=="in")self.show()},self.options.delay.show)};Tooltip.prototype.leave=function(obj){var self=obj instanceof this.constructor?obj:$(obj.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);clearTimeout(self.timeout);self.hoverState="out";if(!self.options.delay||!self.options.delay.hide)return self.hide();self.timeout=setTimeout(function(){if(self.hoverState=="out")self.hide()},self.options.delay.hide)};Tooltip.prototype.show=function(){var e=$.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(e);if(e.isDefaultPrevented())return;var $tip=this.tip();this.setContent();if(this.options.animation)$tip.addClass("fade");var placement=typeof this.options.placement=="function"?this.options.placement.call(this,$tip[0],this.$element[0]):this.options.placement;var autoToken=/\s?auto?\s?/i;var autoPlace=autoToken.test(placement);if(autoPlace)placement=placement.replace(autoToken,"")||"top";$tip.detach().css({top:0,left:0,display:"block"}).addClass(placement);this.options.container?$tip.appendTo(this.options.container):$tip.insertAfter(this.$element);var pos=this.getPosition();var actualWidth=$tip[0].offsetWidth;var actualHeight=$tip[0].offsetHeight;if(autoPlace){var $parent=this.$element.parent();var orgPlacement=placement;var docScroll=document.documentElement.scrollTop||document.body.scrollTop;var parentWidth=this.options.container=="body"?window.innerWidth:$parent.outerWidth();var parentHeight=this.options.container=="body"?window.innerHeight:$parent.outerHeight();var parentLeft=this.options.container=="body"?0:$parent.offset().left;placement=placement=="bottom"&&pos.top+pos.height+actualHeight-docScroll>parentHeight?"top":placement=="top"&&pos.top-docScroll-actualHeight<0?"bottom":placement=="right"&&pos.right+actualWidth>parentWidth?"left":placement=="left"&&pos.left-actualWidth '});Popover.prototype=$.extend({},$.fn.tooltip.Constructor.prototype);Popover.prototype.constructor=Popover;Popover.prototype.getDefaults=function(){return Popover.DEFAULTS};Popover.prototype.setContent=function(){var $tip=this.tip();var title=this.getTitle();var content=this.getContent();$tip.find(".popover-title")[this.options.html?"html":"text"](title);$tip.find(".popover-content")[this.options.html?"html":"text"](content);$tip.removeClass("fade top bottom left right in");if(!$tip.find(".popover-title").html())$tip.find(".popover-title").hide()};Popover.prototype.hasContent=function(){return this.getTitle()||this.getContent()};Popover.prototype.getContent=function(){var $e=this.$element;var o=this.options;return $e.attr("data-content")||(typeof o.content=="function"?o.content.call($e[0]):o.content)};Popover.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};Popover.prototype.tip=function(){if(!this.$tip)this.$tip=$(this.options.template);return this.$tip};var old=$.fn.popover;$.fn.popover=function(option){return this.each(function(){var $this=$(this);var data=$this.data("bs.popover");var options=typeof option=="object"&&option;if(!data)$this.data("bs.popover",data=new Popover(this,options));if(typeof option=="string")data[option]()})};$.fn.popover.Constructor=Popover;$.fn.popover.noConflict=function(){$.fn.popover=old;return this}}(jQuery);+function($){"use strict";function ScrollSpy(element,options){var href;var process=$.proxy(this.process,this);this.$element=$(element).is("body")?$(window):$(element);this.$body=$("body");this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",process);this.options=$.extend({},ScrollSpy.DEFAULTS,options);this.selector=(this.options.target||(href=$(element).attr("href"))&&href.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a";this.offsets=$([]);this.targets=$([]);this.activeTarget=null;this.refresh();this.process()}ScrollSpy.DEFAULTS={offset:10};ScrollSpy.prototype.refresh=function(){var offsetMethod=this.$element[0]==window?"offset":"position";this.offsets=$([]);this.targets=$([]);var self=this;var $targets=this.$body.find(this.selector).map(function(){var $el=$(this);var href=$el.data("target")||$el.attr("href");var $href=/^#\w/.test(href)&&$(href);return $href&&$href.length&&[[$href[offsetMethod]().top+(!$.isWindow(self.$scrollElement.get(0))&&self.$scrollElement.scrollTop()),href]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){self.offsets.push(this[0]);self.targets.push(this[1])})};ScrollSpy.prototype.process=function(){var scrollTop=this.$scrollElement.scrollTop()+this.options.offset;var scrollHeight=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight;var maxScroll=scrollHeight-this.$scrollElement.height();var offsets=this.offsets;var targets=this.targets;var activeTarget=this.activeTarget;var i;if(scrollTop>=maxScroll){return activeTarget!=(i=targets.last()[0])&&this.activate(i)}for(i=offsets.length;i--;){activeTarget!=targets[i]&&scrollTop>=offsets[i]&&(!offsets[i+1]||scrollTop<=offsets[i+1])&&this.activate(targets[i])}};ScrollSpy.prototype.activate=function(target){this.activeTarget=target;$(this.selector).parents(".active").removeClass("active");var selector=this.selector+'[data-target="'+target+'"],'+this.selector+'[href="'+target+'"]';var active=$(selector).parents("li").addClass("active");if(active.parent(".dropdown-menu").length){active=active.closest("li.dropdown").addClass("active")}active.trigger("activate")};var old=$.fn.scrollspy;$.fn.scrollspy=function(option){return this.each(function(){var $this=$(this);var data=$this.data("bs.scrollspy");var options=typeof option=="object"&&option;if(!data)$this.data("bs.scrollspy",data=new ScrollSpy(this,options));if(typeof option=="string")data[option]()})};$.fn.scrollspy.Constructor=ScrollSpy;$.fn.scrollspy.noConflict=function(){$.fn.scrollspy=old;return this};$(window).on("load",function(){$('[data-spy="scroll"]').each(function(){var $spy=$(this);$spy.scrollspy($spy.data())})})}(jQuery);+function($){"use strict";var Tab=function(element){this.element=$(element)};Tab.prototype.show=function(){var $this=this.element;var $ul=$this.closest("ul:not(.dropdown-menu)");var selector=$this.data("target");if(!selector){selector=$this.attr("href");selector=selector&&selector.replace(/.*(?=#[^\s]*$)/,"")}if($this.parent("li").hasClass("active"))return;var previous=$ul.find(".active:last a")[0];var e=$.Event("show.bs.tab",{relatedTarget:previous});$this.trigger(e);if(e.isDefaultPrevented())return;var $target=$(selector);this.activate($this.parent("li"),$ul);this.activate($target,$target.parent(),function(){$this.trigger({type:"shown.bs.tab",relatedTarget:previous})})};Tab.prototype.activate=function(element,container,callback){var $active=container.find("> .active");var transition=callback&&$.support.transition&&$active.hasClass("fade");function next(){$active.removeClass("active").find("> .dropdown-menu > .active").removeClass("active");element.addClass("active");if(transition){element[0].offsetWidth;element.addClass("in")}else{element.removeClass("fade")}if(element.parent(".dropdown-menu")){element.closest("li.dropdown").addClass("active")}callback&&callback()}transition?$active.one($.support.transition.end,next).emulateTransitionEnd(150):next();$active.removeClass("in")};var old=$.fn.tab;$.fn.tab=function(option){return this.each(function(){var $this=$(this);var data=$this.data("bs.tab");if(!data)$this.data("bs.tab",data=new Tab(this));if(typeof option=="string")data[option]()
-})};$.fn.tab.Constructor=Tab;$.fn.tab.noConflict=function(){$.fn.tab=old;return this};$(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(e){e.preventDefault();$(this).tab("show")})}(jQuery);+function($){"use strict";var Affix=function(element,options){this.options=$.extend({},Affix.DEFAULTS,options);this.$window=$(window).on("scroll.bs.affix.data-api",$.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",$.proxy(this.checkPositionWithEventLoop,this));this.$element=$(element);this.affixed=this.unpin=null;this.checkPosition()};Affix.RESET="affix affix-top affix-bottom";Affix.DEFAULTS={offset:0};Affix.prototype.checkPositionWithEventLoop=function(){setTimeout($.proxy(this.checkPosition,this),1)};Affix.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var scrollHeight=$(document).height();var scrollTop=this.$window.scrollTop();var position=this.$element.offset();var offset=this.options.offset;var offsetTop=offset.top;var offsetBottom=offset.bottom;if(typeof offset!="object")offsetBottom=offsetTop=offset;if(typeof offsetTop=="function")offsetTop=offset.top();if(typeof offsetBottom=="function")offsetBottom=offset.bottom();var affix=this.unpin!=null&&scrollTop+this.unpin<=position.top?false:offsetBottom!=null&&position.top+this.$element.height()>=scrollHeight-offsetBottom?"bottom":offsetTop!=null&&scrollTop<=offsetTop?"top":false;if(this.affixed===affix)return;if(this.unpin)this.$element.css("top","");this.affixed=affix;this.unpin=affix=="bottom"?position.top-scrollTop:null;this.$element.removeClass(Affix.RESET).addClass("affix"+(affix?"-"+affix:""));if(affix=="bottom"){this.$element.offset({top:document.body.offsetHeight-offsetBottom-this.$element.height()})}};var old=$.fn.affix;$.fn.affix=function(option){return this.each(function(){var $this=$(this);var data=$this.data("bs.affix");var options=typeof option=="object"&&option;if(!data)$this.data("bs.affix",data=new Affix(this,options));if(typeof option=="string")data[option]()})};$.fn.affix.Constructor=Affix;$.fn.affix.noConflict=function(){$.fn.affix=old;return this};$(window).on("load",function(){$('[data-spy="affix"]').each(function(){var $spy=$(this);var data=$spy.data();data.offset=data.offset||{};if(data.offsetBottom)data.offset.bottom=data.offsetBottom;if(data.offsetTop)data.offset.top=data.offsetTop;$spy.affix(data)})})}(jQuery);var LEA={};var Notebook={cache:{}};var Note={cache:{}};var Tag={};var Notebook={};var Share={};var Converter;var MarkdownEditor;var ScrollLink;function trimLeft(str,substr){if(!substr||substr==" "){return $.trim(str)}while(str.indexOf(substr)==0){str=str.substring(substr.length)}return str}function json(str){return eval("("+str+")")}function t(){var args=arguments;if(args.length<=1){return args[0]}var text=args[0];if(!text){return text}var pattern="LEAAEL";text=text.replace(/\?/g,pattern);for(var i=1;i<=args.length;++i){text=text.replace(pattern,args[i])}return text}function arrayEqual(a,b){a=a||[];b=b||[];return a.join(",")==b.join(",")}function isArray(obj){return Object.prototype.toString.call(obj)==="[object Array]"}function isEmpty(obj){if(!obj){return true}if(isArray(obj)){if(obj.length==0){return true}}return false}function getFormJsonData(formId){var data=formArrDataToJson($("#"+formId).serializeArray());return data}function formArrDataToJson(arrData){var datas={};var arrObj={};for(var i in arrData){var attr=arrData[i].name;var value=arrData[i].value;if(attr.substring(attr.length-2,attr.length)=="[]"){attr=attr.substring(0,attr.length-2);if(arrObj[attr]==undefined){arrObj[attr]=[value]}else{arrObj[attr].push(value)}continue}datas[attr]=value}return $.extend(datas,arrObj)}function formSerializeDataToJson(formSerializeData){var arr=formSerializeData.split("&");var datas={};var arrObj={};for(var i=0;i