fix merge conflict

public/css/theme/default.css

@@ -1,5 +1 @@
-<<<<<<< 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:#fLine truncated
-=======
 @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-Line truncated
->>>>>>> develop

public/css/theme/simple.css

@@ -1,5 +1 @@
-<<<<<<< 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{backgLine truncated
-=======
 @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-Line truncated
->>>>>>> develop

public/css/theme/writting-overwrite.css

@@ -1,5 +1 @@
-<<<<<<< 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;ovLine truncated
-=======
 @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 LigLine truncated
->>>>>>> develop

public/css/theme/writting.css

@@ -1,5 +1 @@
-<<<<<<< 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;ovLine truncated
-=======
 @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 LigLine truncated
->>>>>>> develop