fix for windows & linux

LICENSE

@@ -0,0 +1,359 @@
+LEANOTE - NOT JUST A NOTEBOOK!
+
+Copyright 2014 by the contributors
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+leanote is licensed under the GPL v2.
+
+                       life(life@leanote.com, lifephp@gmail.com)
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+                       GNU GENERAL PUBLIC LICENSE
+                           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {description}
+    Copyright (C) {year}  {fullname}
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  {signature of Ty Coon}, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

login.html

@@ -12,6 +12,12 @@
 <link href="public/css/bootstrap.css" rel="stylesheet">
 <link href="public/css/font-awesome-4.2.0/css/font-awesome.css" rel="stylesheet">
 <link href="public/css/index.css" rel="stylesheet">
+<script>
+// for windows
+if(process.platform != 'darwin') {
+	document.write('<link rel="stylesheet" href="public/css/windows.css" type="text/css" />');
+}
+</script>
 </head>
 <body id="boxBody">
 	<div id="container">
@@ -20,6 +26,7 @@
 <a class="tool-close-blur"></a>
 </div>
 <section id="box" class="animated fadeInUp">
+	<div class="drag"></div>
 	<div>
 		<h1 id="logo">
 			<a onclick="openExternal('http://leanote.com')" id="loadingLogo" title="leanote">
@@ -56,6 +63,11 @@
 <script src="public/js/common.js"></script>
 
 <script>
+var gui = require('nw.gui');
+var win = gui.Window.get();
+// win.focus();
+// gui.Window.focus();
+
 $(function() {
 	$("#email").focus();
 	if($("#email").val()) {
@@ -97,7 +109,10 @@ $(function() {
 			// $("#loginBtn").html("Sign in").removeClass("disabled");
 			if(ret.Ok) {
 				// $("#loginBtn").html("Success...");
-				location.href = 'index.html';
+				// location.href = 'index.html';
+
+				gui.Window.open('note.html', getMainWinParams());
+				win.close();
 			} else {
 				showMsg("Email or Password Error");
 			}
@@ -127,8 +142,6 @@ $(function() {
 	});
 });
 
-var gui = require('nw.gui');
-var win = gui.Window.get();
 win.resizeTo(258, 326);
 win.setPosition('center');
 

note.html

@@ -23,6 +23,12 @@
 <link rel="stylesheet" href="public/css/theme/presentation.css" type="text/css" disabled id="themePresentation"/>
 <link rel="stylesheet" href="public/css/theme/writting.css" type="text/css" disabled id="themeWritting"/>
 
+<script>
+// for windows
+if(process.platform != 'darwin') {
+	document.write('<link rel="stylesheet" href="public/css/theme/windows.css" type="text/css" />');
+}
+</script>
 <!-- mdeditor -->
 <link href="public/dist/themes/default.css" rel="stylesheet" />
 <style>
@@ -33,6 +39,7 @@
 function log(o) {
   console.log(o);
 }
+
 </script>
 </head>
 <body class="clearfix init">
@@ -802,7 +809,7 @@ window.requireNode = window.require;
 window.require = undefined;
 </script>
 <!-- 渲染view -->
-<script src="public/tinymce/tinymce.dev.js"></script>
+<script src="public/tinymce/tinymce.js"></script>
 <script src="public/libs/ace/ace.js"></script>
 <script src="public/js/app/page.js"></script>
 <script src="public/js/bootstrap-min.js"></script>

npm-debug.log

@@ -1,25 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ 'node', '/usr/bin/npm', 'install', 'needle' ]
-2 info using npm@2.1.11
-3 info using node@v0.10.33
-4 verbose node symlink /usr/bin/node
-5 verbose stack Error: Invalid version: "0.1"
-5 verbose stack     at Object.module.exports.fixVersionField (/usr/lib/node_modules/npm/node_modules/normalize-package-data/lib/fixer.js:190:13)
-5 verbose stack     at /usr/lib/node_modules/npm/node_modules/normalize-package-data/lib/normalize.js:30:38
-5 verbose stack     at Array.forEach (native)
-5 verbose stack     at normalize (/usr/lib/node_modules/npm/node_modules/normalize-package-data/lib/normalize.js:29:15)
-5 verbose stack     at final (/usr/lib/node_modules/npm/node_modules/read-package-json/read-json.js:342:33)
-5 verbose stack     at then (/usr/lib/node_modules/npm/node_modules/read-package-json/read-json.js:126:33)
-5 verbose stack     at /usr/lib/node_modules/npm/node_modules/read-package-json/read-json.js:331:40
-5 verbose stack     at evalmachine.<anonymous>:271:14
-5 verbose stack     at /usr/lib/node_modules/npm/node_modules/graceful-fs/graceful-fs.js:102:5
-5 verbose stack     at Object.oncomplete (evalmachine.<anonymous>:107:15)
-6 verbose cwd /Users/life/Documents/kuaipan/leanote/desktop-app
-7 error Darwin 13.4.0
-8 error argv "node" "/usr/bin/npm" "install" "needle"
-9 error node v0.10.33
-10 error npm  v2.1.11
-11 error Invalid version: "0.1"
-12 error If you need help, you may report this error at:
-12 error     <http://github.com/npm/npm/issues>
-13 verbose exit [ 1, true ]

package.json

@@ -4,16 +4,17 @@
   "version": "0.1",
   "main": "note.html",
   "window": {
-    "toolbar": true,
+    "toolbar": false,
     
     "frame": false,
     "transparent": true,
 
-    "min_width": 400,
+    "min_width": 258,
-    "min_height": 200,
+    "min_height": 326,
     // "width":  400, // 1100,
     // "height": 300 // 600
     "width":  258,
     "height": 326
-  }
+  },
+  "chromium-args": "--enable-smooth-scrolling"
 }

public/css/index.css

@@ -708,21 +708,31 @@ html {
   border-radius: 5px;
 }
 body {
-  -webkit-app-region: drag;
   position: relative;
   background-color: transparent;
 }
 body #container {
   position: relative;
-  margin: 5px;
+  margin: 5px auto;
   width: 248px;
   height: 316px;
   background-color: rgba(247, 249, 250, 0.99);
   border-radius: 5px;
   border: 1px solid #eee;
-  -webkit-user-select: none;
   box-shadow: 0px 0px 5px rgba(66, 66, 66, 0.5);
 }
+#logo,
+btns {
+  -webkit-user-select: none;
+}
+.drag {
+  -webkit-app-region: drag;
+  height: 30px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+}
 .pwd-group {
   position: relative;
 }

public/css/index.less

@@ -776,14 +776,15 @@ html {
 	// height: 326px;
 }
 body {
-	-webkit-app-region: drag;
+	// -webkit-app-region: drag;
 	position: relative;
 	background-color: transparent;
 	// width: 248px;
 	// height: 316px;
 	#container {
 		position: relative;
-		margin: 5px;
+		// margin: 5px;
+		margin: 5px auto;
 		// margin-top: 0;
 		// left: 5px;
 		// right: 5px;
@@ -795,12 +796,23 @@ body {
 		background-color: rgba(247,249,250,0.99);
 		border-radius: 5px;
 		border: 1px solid #eee;
-		-webkit-user-select: none; // input, textarea还是可以选择的
+		// -webkit-user-select: none; // input, textarea还是可以选择的
 		// box-shadow: 0 0 50px #eee;
 		// box-shadow: 0px 0px 5px #666;
 		box-shadow: 0px 0px 5px rgba(66, 66, 66, 0.5);
 	}
 }
+#logo, btns {
+	-webkit-user-select: none;
+}
+.drag {
+	-webkit-app-region: drag;
+	height: 30px;
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+}
 .pwd-group {
 	position: relative;
 }

public/css/theme/basic.less

@@ -1,3 +1,5 @@
+@fontFamily: 'Open Sans', 'Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;
+
 // font
 @font-face {
   font-family: 'Open Sans';
@@ -1517,38 +1519,6 @@ top: 4px;
 	white-space: nowrap;text-overflow:ellipsis; overflow:hidden;
 }
 
-// scrollbar style TODO
-// https://www.webkit.org/blog/363/styling-scrollbars/
-// http://trac.webkit.org/export/41842/trunk/LayoutTests/scrollbars/overflow-scrollbar-combinations.html
-
-
-/*
- *  STYLE 2
- */
-/*
-*::-webkit-scrollbar-track
-{
-	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-	border-radius: 10px;
-	background-color: #F5F5F5;
-}
-
-*::-webkit-scrollbar
-{
-	width: 10px;
-	background-color: #F5F5F5;
-	position: absolute;
-	-webkit-transform: translatez(0);
-}
-
-*::-webkit-scrollbar-thumb
-{
-	border-radius: 10px;
-	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
-	background-color: #D62929;
-}
-*/
-
 html,body, #page, #pageInner {
 	position: absolute;
 	left: 0px;
@@ -1605,17 +1575,6 @@ body {
 	}
 }
 
-#topDrag {
-	-webkit-app-region: drag;
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	height: 10px;
-	z-index: 1000;
-	cursor: move;
-	// background-color: red;
-}
 
 #searchNoteInput, 
 #searchNotebookForList, 
@@ -1633,12 +1592,8 @@ body {
 	#pageInner {
 	}
 }
-#noteList {
+
-	top: 5px;
+
-}
-#note {
-	top: 5px;
-}
 #noteAndEditor {
 	// top: 5px !important;
 	// padding-top: 50px;
@@ -1654,11 +1609,10 @@ body {
 	border-radius: 5px 0 0 0;
 }
 #notebook {
-	top: 40px !important;
 	background: transparent !important;
 	#myStarredNotes {
 		.folderHeader {
-			border-top: 1px solid rgba(0, 0, 0, 0.05);
+			// border-top: 1px solid rgba(0, 0, 0, 0.05);
 		}
 	}
 }
@@ -1736,6 +1690,58 @@ body {
 	font-weight: bold;
 }
 
+//----------- start
+// top topDrag
+#noteList, #note {
+	// top: 15px;
+	top: 5px;
+	// padding-top: 5px;
+}
+#noteList {
+	top: 0;
+	padding-top: 5px;
+}
+#notebook {
+	top: 40px !important;
+}
+#noteItemListWrap {
+	top: 75px;
+}
+#myNotebookNavForListNav {
+  line-height: 35px;
+}
+#notebook {
+	#myStarredNotes {
+		.folderHeader {
+			border-top: 1px solid rgba(0, 0, 0, 0.05);
+		}
+	}
+}
+#sortType {
+	display: none;
+}
+#myNotebookNavForListNav span {
+	font-size: 16px;
+}
+#notesAndSort, #tool {
+	// top: -5px;
+	// height: 41px;
+}
+#editor, #mdEditor {
+	// top: 51px;
+}
+#topDrag {
+	-webkit-app-region: drag;
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	height: 10px;
+	z-index: 1000;
+	cursor: move;
+	// background-color: red;
+}
+//--------- end
 
 @import '../traffic.less';
 @import '../ani.less';

public/css/theme/simple.css

@@ -1373,32 +1373,6 @@ h3 {
   text-overflow: ellipsis;
   overflow: hidden;
 }
-/*
- *  STYLE 2
- */
-/*
-*::-webkit-scrollbar-track
-{
-	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-	border-radius: 10px;
-	background-color: #F5F5F5;
-}
-
-*::-webkit-scrollbar
-{
-	width: 10px;
-	background-color: #F5F5F5;
-	position: absolute;
-	-webkit-transform: translatez(0);
-}
-
-*::-webkit-scrollbar-thumb
-{
-	border-radius: 10px;
-	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
-	background-color: #D62929;
-}
-*/
 html,
 body,
 #page,
@@ -1449,22 +1423,6 @@ body.init .loading-footer {
 body.init #pageInner {
   display: none;
 }
-#topDrag {
-  -webkit-app-region: drag;
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 10px;
-  z-index: 1000;
-  cursor: move;
-}
-#noteList {
-  top: 5px;
-}
-#note {
-  top: 5px;
-}
 #leftNotebook {
   overflow: hidden;
   border-radius: 5px 0 0 0;
@@ -1475,12 +1433,8 @@ body.init #pageInner {
   border-radius: 5px 0 0 0;
 }
 #notebook {
-  top: 40px !important;
   background: transparent !important;
 }
-#notebook #myStarredNotes .folderHeader {
-  border-top: 1px solid rgba(0, 0, 0, 0.05);
-}
 #leftNotebook {
   background: url(images/mohu.png) !important;
   background-repeat: repeat;
@@ -1544,6 +1498,42 @@ body.init #pageInner {
 .opened .folderHeader span {
   font-weight: bold;
 }
+#noteList,
+#note {
+  top: 5px;
+}
+#noteList {
+  top: 0;
+  padding-top: 5px;
+}
+#notebook {
+  top: 40px !important;
+}
+#noteItemListWrap {
+  top: 75px;
+}
+#myNotebookNavForListNav {
+  line-height: 35px;
+}
+#notebook #myStarredNotes .folderHeader {
+  border-top: 1px solid rgba(0, 0, 0, 0.05);
+}
+#sortType {
+  display: none;
+}
+#myNotebookNavForListNav span {
+  font-size: 16px;
+}
+#topDrag {
+  -webkit-app-region: drag;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 10px;
+  z-index: 1000;
+  cursor: move;
+}
 .win-tool {
   padding: 5px;
   position: absolute;
@@ -1868,6 +1858,7 @@ a.raw:hover {
   cursor: pointer;
   border-bottom: 1px solid transparent;
   border-color: rgba(0, 0, 0, 0.05);
+  height: 36px;
 }
 .folderHeader span {
   display: inline-block;
@@ -2299,416 +2290,3 @@ background-position:-1px -670px
 #notebookList {
   border-top: 1px dashed #eee;
 }
-@media screen and (max-width: 700px) {
-  #toggleEditorMode,
-  #lea,
-  #myBlog,
-  #demoRegister,
-  .noteSplit,
-  #logo,
-  #tipsBtn,
-  #contentHistory,
-  #curNotebookForNewNote,
-  #curNotebookForNewSharedNote,
-  .for-split,
-  #listNotebookDropdownMenu,
-  #listShareNotebookDropdownMenu,
-  .new-markdown-text,
-  .new-note-text,
-  .username,
-  #notebookMin,
-  .ui-loader,
-  #md-section-helper,
-  #right-column,
-  .writing-mobile-hide {
-    display: none !important;
-  }
-  *,
-  .ztree li a.level0 span,
-  .ztree li a.level1 span,
-  .label {
-    font-size: 16px;
-  }
-  .label i {
-    opacity: 1;
-    width: 20px;
-  }
-  .label i:hover,
-  .label i:focus {
-    color: #65bd77 !important;
-  }
-  a:focus,
-  a:hover,
-  a:active {
-    color: #65bd77 !important;
-  }
-  #noteItemList .item {
-    height: 120px;
-  }
-  #leftNotebook {
-    width: 140px !important;
-    max-width: 140px;
-  }
-  #notebook {
-    display: block !important;
-  }
-  #leftNotebook .slimScrollDiv {
-    display: block !important;
-  }
-  #switcher {
-    padding-top: 0;
-    padding-right: 0;
-  }
-  #switcher i {
-    padding: 20px 0;
-    font-size: 20px;
-  }
-  #newNoteMarkdownBtn {
-    width: 10px;
-    overflow: hidden;
-  }
-  #noteAndEditor {
-    left: 140px !important;
-  }
-  #noteList {
-    display: block;
-    width: 100% !important;
-  }
-  #note {
-    visibility: hidden;
-    z-index: -1;
-    overflow-x: hidden;
-    left: 0 !important;
-  }
-  #note #editor {
-    visibility: hidden;
-  }
-  #note .mce-tinymce {
-    visibility: hidden !important;
-  }
-  #note.editor-show {
-    visibility: visible;
-    z-index: initial;
-  }
-  #note.editor-show #editor {
-    visibility: visible;
-  }
-  #note.editor-show .mce-tinymce {
-    visibility: visible !important;
-  }
-  #leftSwitcher {
-    display: block !important;
-  }
-  #leftSwitcher2 {
-    display: none !important;
-  }
-  .full-editor #leftNotebook {
-    display: none;
-  }
-  .full-editor #noteAndEditor {
-    left: 0 !important;
-  }
-  .full-editor #noteList {
-    display: none;
-  }
-  #searchWrap {
-    margin-left: 3px;
-  }
-  #searchNote {
-    border-top: none;
-    border-bottom: none;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-    padding-right: 10px;
-  }
-  #searchNote input {
-    width: 55px;
-    padding-left: 5px;
-    padding-right: 2px;
-    margin-top: 3px;
-    -webkit-transform: translate3d(0, 0, 0);
-    -webkit-transition: 0.3s ease;
-    -moz-transition: 0.3s ease;
-    transition: 0.3s ease;
-  }
-  #searchNote input:focus {
-    width: 100px;
-  }
-  #tool {
-    position: relative;
-  }
-  #tag {
-    position: absolute;
-    right: 140px;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    overflow: hidden;
-  }
-  #tag #tags {
-    left: 50px;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    overflow-y: hidden;
-    overflow-x: scroll;
-    position: absolute;
-    line-height: 40px;
-    line-height: inherit !important;
-  }
-  #tag #tagDropdown {
-    float: left;
-    width: 50px;
-    line-height: 40px;
-    overflow: hidden;
-    padding-left: 3px;
-  }
-  #tag .add-tag-text {
-    display: none;
-  }
-  #tag #addTagInput {
-    width: 30px;
-    display: inline-block;
-  }
-  #tag #tagColor {
-    display: none !important;
-  }
-  #left-column {
-    width: 100% !important;
-  }
-  #mdEditor #wmd-input {
-    font-size: 16px;
-  }
-  .new-markdown-text-abbr,
-  .new-note-text-abbr {
-    display: inline;
-  }
-  .my-link {
-    display: block;
-  }
-  #themeForm img {
-    height: 70px !important;
-  }
-  .slimScrollBar,
-  .slimScrollRail {
-    display: none !important;
-  }
-  #noteItemList,
-  #notebook,
-  #leftNotebook,
-  .slimScrollDiv,
-  #editorContent_ifr,
-  .mce-edit-area,
-  .mce-container-body,
-  .mce-tinymce,
-  #editor .mce-ifr,
-  .wmd-input,
-  #noteReadContent,
-  #attachList,
-  #tags {
-    -webkit-overflow-scrolling: touch !important;
-    overflow: auto !important;
-  }
-  #attachMenu {
-    width: 320px;
-  }
-  #attachList {
-    max-height: 200px;
-  }
-  #attachList li .attach-title {
-    width: 170px;
-  }
-  #dropAttach .btn {
-    padding: 5px 3px;
-    margin-top: 3px;
-    display: block;
-  }
-  #myTag .folderBody li {
-    margin: 5px;
-  }
-  #myTag .folderBody li a:hover span {
-    color: #65bd77;
-  }
-  #noteItemList .item-thumb {
-    width: 80px;
-    height: 80px;
-    margin-top: 15px;
-  }
-  #noteItemList .item {
-    height: 118px;
-  }
-  #noteItemList .item-setting,
-  #noteItemList .item-blog {
-    font-size: 16px;
-    width: 30px;
-    display: inline-block;
-  }
-  #noteMaskForLoading {
-    opacity: 0.8;
-  }
-  #editorContent .ace-tomorrow {
-    padding: 0;
-  }
-}
-@media screen and (max-width: 1024px) {
-  #noteItemList,
-  #notebook,
-  #leftNotebook,
-  .slimScrollDiv,
-  #editorContent_ifr,
-  .mce-edit-area,
-  .mce-container-body,
-  .mce-tinymce,
-  #editor .mce-ifr,
-  .wmd-input,
-  #noteReadContent,
-  #attachList,
-  #tags {
-    overflow: auto !important;
-    -webkit-overflow-scrolling: touch !important;
-  }
-  #tag {
-    position: absolute;
-    right: 310px;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    overflow: hidden;
-  }
-  #tag #tags {
-    left: 50px;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    overflow-y: hidden;
-    overflow-x: scroll;
-    position: absolute;
-    line-height: 40px;
-    line-height: inherit !important;
-  }
-  #tag #tagDropdown {
-    float: left;
-    width: 50px;
-    line-height: 40px;
-    overflow: hidden;
-    padding-left: 3px;
-  }
-  #tag .add-tag-text {
-    display: none;
-  }
-  #tag #addTagInput {
-    width: 30px;
-    display: inline-block;
-  }
-  #tag #tagColor {
-    display: none !important;
-  }
-}
-@media screen and (max-width: 800px) {
-  #noteItemList,
-  #notebook,
-  #leftNotebook,
-  .slimScrollDiv,
-  #editorContent_ifr,
-  .mce-edit-area,
-  .mce-container-body,
-  .mce-tinymce,
-  #editor .mce-ifr,
-  .wmd-input,
-  #noteReadContent,
-  #attachList,
-  #tags {
-    overflow: auto !important;
-    -webkit-overflow-scrolling: touch !important;
-  }
-  #lea,
-  .lea-blog,
-  #myBlog,
-  #demoRegister,
-  .noteSplit,
-  #tipsBtn,
-  #contentHistory,
-  #curNotebookForNewNote,
-  #curNotebookForNewSharedNote,
-  .for-split,
-  #listNotebookDropdownMenu,
-  #listShareNotebookDropdownMenu,
-  .username,
-  .ui-loader,
-  #md-section-helper,
-  #right-column {
-    display: none !important;
-  }
-  #tag {
-    position: absolute;
-    right: 160px;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    overflow: hidden;
-  }
-  #tag #tags {
-    left: 50px;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    overflow-y: hidden;
-    overflow-x: scroll;
-    position: absolute;
-    line-height: 40px;
-    line-height: inherit !important;
-  }
-  #tag #tagDropdown {
-    float: left;
-    width: 50px;
-    line-height: 40px;
-    overflow: hidden;
-    padding-left: 3px;
-  }
-  #tag .add-tag-text {
-    display: none;
-  }
-  #tag #addTagInput {
-    width: 30px;
-    display: inline-block;
-  }
-  #tag #tagColor {
-    display: none !important;
-  }
-  .my-link {
-    display: block;
-  }
-  #attachMenu {
-    width: 320px;
-  }
-  #attachList {
-    max-height: 200px;
-  }
-  #attachList li .attach-title {
-    width: 170px;
-  }
-  #dropAttach .btn {
-    padding: 5px 3px;
-    margin-top: 3px;
-    display: block;
-  }
-  #myTag .folderBody li {
-    margin: 5px;
-  }
-  #myTag .folderBody li a:hover span {
-    color: #65bd77;
-  }
-  #left-column {
-    width: 100% !important;
-  }
-  #mdEditor #wmd-input {
-    font-size: 16px;
-  }
-  .my-link {
-    display: block;
-  }
-  #themeForm img {
-    height: 70px !important;
-  }
-}

public/css/theme/simple.less

@@ -2,7 +2,6 @@
 
 @bgColor: #fff;
 @headerBgColor: #fff;
-@fontFamily: 'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;
 @aWhiteColor: #fff;
 @aBlackColor: #000;
 @borderColor: #EBEFF2;
@@ -282,6 +281,7 @@ a.raw:hover {
   cursor: pointer;
   border-bottom: 1px solid transparent;
   border-color: rgba(0,0,0,0.05);
+  height: 36px;
 }
 .folderHeader span {
 	display: inline-block;
@@ -758,5 +758,5 @@ background-position:-1px -670px
 	border-top: 1px dashed #eee;
 }
 
-@import "mobile.less";
+// @import "mobile.less";
 

public/css/theme/windows.css

@@ -0,0 +1,71 @@
+/*
+ *  STYLE 2
+ */
+*::-webkit-scrollbar-track {
+  border-radius: 3px;
+  background-color: transparent;
+}
+*::-webkit-scrollbar {
+  width: 6px;
+  background-color: transparent;
+  position: absolute;
+  -webkit-transform: translatez(0);
+}
+*::-webkit-scrollbar-thumb {
+  border-radius: 5px;
+  -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
+  background-color: rgba(127, 127, 127, 0.9);
+}
+*::-webkit-scrollbar-thumb:hover {
+  background-color: #7f7f7f;
+}
+*::-webkit-scrollbar-thumb:active {
+  background-color: #7f7f7f;
+}
+#leftNotebook ::-webkit-scrollbar-thumb,
+#noteList ::-webkit-scrollbar-thumb,
+#editorContentWrap ::-webkit-scrollbar-thumb,
+#editorContent ::-webkit-scrollbar-thumb {
+  visibility: hidden;
+}
+#leftNotebook:hover ::-webkit-scrollbar-thumb,
+#noteList:hover ::-webkit-scrollbar-thumb,
+#editorContentWrap:hover ::-webkit-scrollbar-thumb,
+#editorContent:hover ::-webkit-scrollbar-thumb {
+  visibility: visible;
+}
+body {
+  border: none;
+  border-shadow: none;
+  border-radius: none;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  font-family: '微软雅黑';
+}
+* {
+  font-family: '微软雅黑';
+}
+html,
+body,
+#page,
+#pageInner,
+#noteList,
+#notebook,
+#leftNotebook {
+  border-radius: 0;
+}
+#winTool {
+  display: none;
+}
+#topDrag {
+  display: none;
+}
+#notebook {
+  top: 0 !important;
+}
+#noteList,
+#note {
+  top: 0;
+  padding-top: 0;
+}

public/css/theme/windows.less

@@ -0,0 +1,82 @@
+// scrollbar style TODO
+// https://www.webkit.org/blog/363/styling-scrollbars/
+// http://trac.webkit.org/export/41842/trunk/LayoutTests/scrollbars/overflow-scrollbar-combinations.html
+
+
+/*
+ *  STYLE 2
+ */
+*::-webkit-scrollbar-track
+{
+	// -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+	border-radius: 3px;
+	// background-color: #F5F5F5;
+	background-color: transparent;
+}
+
+*::-webkit-scrollbar
+{
+	width: 6px;
+	// background-color: #F5F5F5;
+	background-color: transparent;
+	position: absolute;
+	-webkit-transform: translatez(0);
+}
+
+*::-webkit-scrollbar-thumb
+{
+	border-radius: 5px;
+	-webkit-box-shadow: inset 0 0 3px rgba(0,0,0,.3);
+	background-color: rgba(127,127,127, .9);
+	
+	&:hover {
+		background-color: rgba(127,127,127, 1);;
+	}
+	&:active {
+		background-color: rgba(127,127,127, 1);;
+	}
+}
+
+#leftNotebook,
+#noteList,
+#editorContentWrap,
+#editorContent
+{
+	::-webkit-scrollbar-thumb {
+		visibility: hidden;
+	}
+	&:hover {
+		::-webkit-scrollbar-thumb {
+			visibility: visible;
+		}
+	}
+}
+
+body {
+	border: none;
+	border-shadow: none;
+	border-radius: none;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	font-family: '微软雅黑';
+}
+* {
+	font-family: '微软雅黑';
+}
+html, body, #page, #pageInner, #noteList, #notebook, #leftNotebook {
+	border-radius: 0;
+}
+#winTool {
+	display: none;
+}
+#topDrag {
+	display: none;
+}
+#notebook {
+	top: 0 !important;
+}
+#noteList, #note {
+	top: 0;
+	padding-top: 0;
+}

public/css/windows.css

@@ -0,0 +1,8 @@
+#winTool {
+  right: 0;
+  left: auto;
+}
+.drag {
+  left: 0;
+  right: 40px;
+}

public/css/windows.less

@@ -0,0 +1,8 @@
+#winTool {
+	right: 0;
+	left: auto;
+}
+.drag {
+	left: 0;
+	right: 40px;
+}

public/js/app/page.js

@@ -1103,8 +1103,10 @@ var State = {
 		$('body').hide();
 		// 延迟, 让body先隐藏, 效果先显示出来
 		setTimeout(function() {
+			if(isMac()) {
 				win.resizeTo(1100, 600);
 				win.setPosition('center');
+			}
 			setTimeout(function() {
 				$('body').show();
 				$('body').removeClass('init');
@@ -1244,6 +1246,7 @@ function initPage() {
 				});
 	 		}
 	 		$('#username').text(UserInfo.Email);
+	 		userMenu();
 		} else {
 			location.href = 'login.html';
 		}
@@ -1311,7 +1314,7 @@ var Pren = {
 	toggleFullscreen: function() {
 		var me = this;
 		win.toggleFullscreen();
-		me._isFullscreen = !isFullscreen;
+		me._isFullscreen = !me._isFullscreen;
 		if(me._isFullscreen) {
 			me.pren.enabled = false;
 		} else {
@@ -1445,7 +1448,7 @@ var Pren = {
 		me.presentationO.on('click', 'a', function(e) {
 			e.preventDefault();
 			var href = $(this).attr('href');
-			if(href.indexOf('http://127.0.0.1') < 0 && isURL(href)) {
+			if(href && href.indexOf('http://127.0.0.1') < 0 && isURL(href)) {
 				openExternal(href);
 			}
 		});
@@ -1469,6 +1472,26 @@ var Pren = {
 
 // user
 function userMenu() {
+	// ----------
+	// 全局菜单
+
+	Pren.init();
+	var mode = new gui.Menu();
+	mode.append(Pren.pren);
+	mode.append(Pren.fullScreen);
+	var modes = new gui.MenuItem({ label: 'Mode', submenu: mode});
+	if(isMac()) {
+		var nativeMenuBar = new gui.Menu({ type: "menubar" });
+		nativeMenuBar.createMacBuiltin("Leanote");
+		win.menu = nativeMenuBar;
+		win.menu.append(modes);
+	}
+	// windows和linux下就用user's menu来代替
+	else {
+		// alert(process.platform);
+		// win.menu.append(modes);
+	}
+
 	//-------------------
 	// 右键菜单
 	function menu() {
@@ -1486,9 +1509,11 @@ function userMenu() {
 	        click: function(e) {
 	        	// window.open('login.html');
 	        	// win.close();
-	        	
+	        	// 
+	        	switchAccount();
 	        	// 这样, 不能window.open(), 不然needle有问题
-	        	location.href = 'login.html';
+	        	// 可以gui.Window.open();
+	        	// location.href = 'login.html';
 	        }
 	    });
 	    this.theme = new gui.MenuItem({
@@ -1529,11 +1554,21 @@ function userMenu() {
 	    this.menu.append(this.switchAccount);
 	    this.menu.append(new gui.MenuItem({ type: 'separator' }));
 	    this.menu.append(this.theme);
+		
+		var height = 130;
+		if(!isMac()) {
+			this.menu.append(new gui.MenuItem({ type: 'separator' }));
+			this.menu.append(Pren.pren);
+			this.menu.append(Pren.fullScreen);
+			height = 220;
+		}
+
 	    this.menu.append(new gui.MenuItem({ type: 'separator' }));
 	    this.menu.append(this.sync);
 		
+		
 	    this.popup = function(e) {
-			this.menu.popup(10, $('body').height() - 130);
+			this.menu.popup(10, $('body').height() - height);
 	    }
 	}
 
@@ -1543,27 +1578,8 @@ function userMenu() {
 		userMenuSys.popup(e);
 	});
 
-	// 全局菜单
+	// 修改主题
-	Pren.init();
+	changeTheme(UserInfo.Theme);
-	var mode = new gui.Menu();
-	mode.append(Pren.pren);
-	mode.append(Pren.fullScreen);
-	var modes = new gui.MenuItem({ label: 'Mode', submenu: mode});
-	if(process.platform === "darwin") {
-		var nativeMenuBar = new gui.Menu({ type: "menubar" });
-		nativeMenuBar.createMacBuiltin("Leanote");
-		win.menu = nativeMenuBar;
-		win.menu.append(modes);
-	}
-	// windows
-	else {
-		win.menu.append(modes);
-	}
-
-	win.on('move', function(e) {
-		// e.preventDefault();
-		// return false;
-	});
 	
 	// disable drag & drop
 	document.body.addEventListener('dragover', function(e){
@@ -1574,14 +1590,10 @@ function userMenu() {
 	  e.preventDefault();
 	  e.stopPropagation();
 	}, false);
-
-	// 修改主题
-	changeTheme(UserInfo.Theme);
 }
 
 $(function() {
 	initUploadImage();
-	userMenu();
 	Writting.init();
 });
 

public/js/common.js

@@ -1370,7 +1370,11 @@ var ContextTips = {
 
 function switchAccount() {
 	SyncService.stop();
-	location.href = 'login.html';
+	// location.href = 'login.html';
+	var w = gui.Window.open('login.html', {frame: false, toolbar: false, resizable: false, transparent: true, width: 258, max_width: 258});
+	// w.focus();
+	// gui.Window.close();
+	win.close();
 }
 
 function commonCmd(e) {
@@ -1398,6 +1402,31 @@ function loadToolIcons() {
 	}
 }
 
+function isMac() {
+	return process.platform == 'darwin';
+}
+
+function getMainWinParams() {
+	if(isMac()) {
+		return {
+			frame: false,
+			transparent: true,
+			width: 258,
+			height: 326,
+			toolbar: false,
+			"chromium-args": "--enable-smooth-scrolling"
+		};
+	}
+	return {
+		frame: true,
+		transparent: false,
+		width: 1100,
+		height: 600,
+		toolbar: false,
+		"chromium-args": "--enable-smooth-scrolling"
+	};
+}
+
 // loadToolIcons();
 
 ContextTips.init();