基本完成

db

@@ -1 +0,0 @@
-/Users/life/Library/Application Support/Leanote

login.html

@@ -17,7 +17,7 @@
 	<div id="container">
 <!-- 关闭, 最小化, 最大 -->
 <div id="winTool" class="win-tool clearfix">
-<a class="tool-close"></a>
+<a class="tool-close-blur"></a>
 </div>
 <section id="box" class="animated fadeInUp">
 	<div>

main.js

@@ -1,26 +0,0 @@
-global.$ = $;
-
-var abar = require('address_bar');
-var folder_view = require('folder_view');
-var path = require('path');
-var shell = require('nw.gui').Shell;
-
-$(document).ready(function() {
-  var folder = new folder_view.Folder($('#files'));
-  var addressbar = new abar.AddressBar($('#addressbar'));
-
-  folder.open(process.cwd());
-  addressbar.set(process.cwd());
-
-  folder.on('navigate', function(dir, mime) {
-    if (mime.type == 'folder') {
-      addressbar.enter(mime);
-    } else {
-      shell.openItem(mime.path);
-    }
-  });
-
-  addressbar.on('navigate', function(dir) {
-    folder.open(dir);
-  });
-});

node_modules/web.js

@@ -109,7 +109,7 @@ var Web = {
 
 	syncProcess: function(type, title) {
 		var me = this;
-		me.Note.syncProcess('In sync ' + type + ': ' + title);
+		me.Note.syncProcess('In sync ' + type + ' <br /> ' + title);
 	},
 	/*
 	syncNotebookFinish: function() {

public/css/css/black.css

@@ -1,43 +0,0 @@
-#notebook,
-#notebookBottom {
-  background: none !important;
-  background-color: rgba(37, 49, 62, 0.9) !important;
-}
-.folderHeader .fa-left,
-.folderHeader span {
-  color: #fff;
-}
-#addNotebookPlus {
-  color: #F9F8F8;
-}
-#notebookList {
-  border-top: none;
-}
-.folderBody a:hover {
-  background-color: transparent !important;
-  font-weight: bold;
-}
-.ztree li a.curSelectedNode {
-  color: #eee;
-}
-.ztree li a.curSelectedNode,
-#starNotes li.selected {
-  background-color: transparent;
-  font-weight: bold;
-}
-.ztree li a.curSelectedNode a,
-#starNotes li.selected a {
-  color: #eee;
-}
-#starNotes li,
-.ztree li {
-  border: none;
-}
-#starNotes li a,
-.ztree li a {
-  color: #eee;
-}
-.sync-icon,
-#myProfile a {
-  color: #fff;
-}

public/css/index.css

@@ -721,6 +721,41 @@ body #container {
 .win-tool .tool-close {
   background: url(icon/traffic-close@2x.png);
 }
-.win-tool:hover .tool-close {
+.win-tool .tool-close:before {
+  content: ' ';
   background: url(icon/traffic-close-hover@2x.png);
 }
+.win-tool .tool-close-blur {
+  background: url(icon/traffic-disabled@2x.png);
+}
+.win-tool .tool-close-blur:before {
+  content: ' ';
+  background: url(icon/traffic-close-hover@2x.png);
+}
+.win-tool .tool-min {
+  background: url(icon/traffic-minimise@2x.png);
+}
+.win-tool .tool-min:before {
+  content: ' ';
+  background: url(icon/traffic-minimise-hover@2x.png);
+}
+.win-tool .tool-max {
+  background: url(icon/traffic-fullscreen@2x.png);
+}
+.win-tool .tool-max:before {
+  content: ' ';
+  background: url(icon/traffic-zoom-hover@2x.png);
+}
+.win-tool:hover .tool-close,
+.win-tool:hover .tool-close-blur {
+  background: url(icon/traffic-close-hover@2x.png);
+}
+.win-tool:hover .tool-min {
+  background: url(icon/traffic-minimise-hover@2x.png);
+}
+.win-tool:hover .tool-max {
+  background: url(icon/traffic-zoom-hover@2x.png);
+}
+.blur .win-tool a {
+  background: url(icon/traffic-disabled@2x.png);
+}

public/css/index.less

@@ -809,28 +809,5 @@ body {
 		padding: 20px;
 	}
 }
-.win-tool {
-	// height: 14px;
-	padding: 5px;
-	position: absolute;
-	left: 0;
-	top: 0;
-	z-index: 99999;
-	a {
-		display: block;
-		float: left;
-		width: 14px;
-		height: 14px;
-		background-size: 14px 14px !important;
-		margin-right: 5px;
-	}
-	.tool-close {
-		background: url(icon/traffic-close@2x.png);
-	}
 
-	&:hover {
-		.tool-close {
-			background: url(icon/traffic-close-hover@2x.png);
-		}
-	}
-}
+@import "traffic.less";

public/css/theme/basic.less

@@ -1549,43 +1549,6 @@ top: 4px;
 }
 */
 
-.win-tool {
-	// height: 14px;
-	padding: 5px;
-	position: absolute;
-	left: 0;
-	top: 0;
-	z-index: 99999;
-	a {
-		display: block;
-		float: left;
-		width: 14px;
-		height: 14px;
-		background-size: 14px 14px !important;
-		margin-right: 5px;
-	}
-	.tool-close {
-		background: url(../icon/traffic-close@2x.png);
-	}
-	.tool-min {
-		background: url(../icon/traffic-minimise@2x.png);
-	}
-	.tool-max {
-		background: url(../icon/traffic-fullscreen@2x.png);
-	}
-	&:hover {
-		.tool-close {
-			background: url(../icon/traffic-close-hover@2x.png);
-		}
-		.tool-min {
-			background: url(../icon/traffic-minimise-hover@2x.png);
-		}
-		.tool-max {
-			background: url(../icon/traffic-zoom-hover@2x.png);
-		}
-	}
-}
-
 html,body, #page, #pageInner {
 	position: absolute;
 	left: 0px;
@@ -1599,7 +1562,20 @@ html,body, #page, #pageInner {
     background: transparent;
 	// box-shadow: 0px 0px 10px #B52F2F;
 }
+.modal-backdrop {
+	right: 5px;
+	left: 5px;
+	bottom: 5px;
+	border-radius: 5px;
+}
+#mainContainer, #mainMask {
+	border-radius: 5px;
+}
+#noteAndEditor {
+	background-color: #fff;
+}
 body {
+	display: none;
 // #notesAndSort {
 	-webkit-user-select: none; // input, textarea还是可以选择的
     -webkit-app-region: drag;
@@ -1642,6 +1618,7 @@ body {
 	-webkit-user-select: none;
     // -webkit-app-region: drag;
 }
+
 #noteTitle, 
 #searchNoteInput, 
 #searchNotebookForList, 
@@ -1653,3 +1630,5 @@ body {
 {
 	-webkit-app-region: no-drag;
 }
+
+@import '../traffic.less';

public/css/theme/default.css

@@ -1399,39 +1399,6 @@ h3 {
 	background-color: #D62929;
 }
 */
-.win-tool {
-  padding: 5px;
-  position: absolute;
-  left: 0;
-  top: 0;
-  z-index: 99999;
-}
-.win-tool a {
-  display: block;
-  float: left;
-  width: 14px;
-  height: 14px;
-  background-size: 14px 14px !important;
-  margin-right: 5px;
-}
-.win-tool .tool-close {
-  background: url(../icon/traffic-close@2x.png);
-}
-.win-tool .tool-min {
-  background: url(../icon/traffic-minimise@2x.png);
-}
-.win-tool .tool-max {
-  background: url(../icon/traffic-fullscreen@2x.png);
-}
-.win-tool:hover .tool-close {
-  background: url(../icon/traffic-close-hover@2x.png);
-}
-.win-tool:hover .tool-min {
-  background: url(../icon/traffic-minimise-hover@2x.png);
-}
-.win-tool:hover .tool-max {
-  background: url(../icon/traffic-zoom-hover@2x.png);
-}
 html,
 body,
 #page,
@@ -1447,7 +1414,21 @@ body,
   overflow: hidden;
   background: transparent;
 }
+.modal-backdrop {
+  right: 5px;
+  left: 5px;
+  bottom: 5px;
+  border-radius: 5px;
+}
+#mainContainer,
+#mainMask {
+  border-radius: 5px;
+}
+#noteAndEditor {
+  background-color: #fff;
+}
 body {
+  display: none;
   -webkit-user-select: none;
   -webkit-app-region: drag;
   border: 1px solid #ccc;
@@ -1490,6 +1471,62 @@ body {
 #notebook {
   -webkit-app-region: no-drag;
 }
+.win-tool {
+  padding: 5px;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 99999;
+}
+.win-tool a {
+  display: block;
+  float: left;
+  width: 14px;
+  height: 14px;
+  background-size: 14px 14px !important;
+  margin-right: 5px;
+}
+.win-tool .tool-close {
+  background: url(icon/traffic-close@2x.png);
+}
+.win-tool .tool-close:before {
+  content: ' ';
+  background: url(icon/traffic-close-hover@2x.png);
+}
+.win-tool .tool-close-blur {
+  background: url(icon/traffic-disabled@2x.png);
+}
+.win-tool .tool-close-blur:before {
+  content: ' ';
+  background: url(icon/traffic-close-hover@2x.png);
+}
+.win-tool .tool-min {
+  background: url(icon/traffic-minimise@2x.png);
+}
+.win-tool .tool-min:before {
+  content: ' ';
+  background: url(icon/traffic-minimise-hover@2x.png);
+}
+.win-tool .tool-max {
+  background: url(icon/traffic-fullscreen@2x.png);
+}
+.win-tool .tool-max:before {
+  content: ' ';
+  background: url(icon/traffic-zoom-hover@2x.png);
+}
+.win-tool:hover .tool-close,
+.win-tool:hover .tool-close-blur {
+  background: url(icon/traffic-close-hover@2x.png);
+}
+.win-tool:hover .tool-min {
+  background: url(icon/traffic-minimise-hover@2x.png);
+}
+.win-tool:hover .tool-max {
+  background: url(icon/traffic-zoom-hover@2x.png);
+}
+.blur .win-tool a {
+  background: url(icon/traffic-disabled@2x.png);
+}
 ::selection {
   background: #000000;
   color: #ffffff;