diff --git a/db b/db deleted file mode 120000 index 88efd9df..00000000 --- a/db +++ /dev/null @@ -1 +0,0 @@ -/Users/life/Library/Application Support/Leanote \ No newline at end of file diff --git a/html_msg_fix.js b/html_msg_fix.js deleted file mode 100755 index 98227e2c..00000000 --- a/html_msg_fix.js +++ /dev/null @@ -1,38 +0,0 @@ -var fs = require('fs'); - -function log(o) { - console.log(o); -} -var MSG = {"3th":"Third-party accounts","aboutLeanote":"About leanote","aboutMe":"About me","accountSetting":"Account","addChildNotebook":"Add child notebook","addNotebook":"Add notebook","addShare":"Add Friend","all":"Newest","app":"leanote","attachments ":" Attachments","basicInfo":"Basic","blog":"Blog","blogInfo":"You can public your knowledge and leanote is your blog!","blogSet":"Set blog","blue":"blue","cancel":"Cancel","cancelPublic":"Cancel public","canntNewNoteTips":"Sorry, cannot new note in here, please choose a notebook at first.","checkEmai":"Check email","checkEmail":"Check email","clearSearch":"Clear Search","clickAddTag":"Click to add Tag","clickToChangePermission":"Click to change permission","clickToCopy":"Click to copy","close":"Close","confirmBackup":"Are you sure to restore from this version? We will backup the current note.","confirmPassword":"Password not matched","cooperation":"Cooperation","cooperationInfo":"Collaborate with friends to improve your knowledge.","copy":"Copy","copyFailed":"Copy failed","copySuccess":"Copy success","copyToMyNotebook":"Copy to my notebook","create":"Create","createAccount":"Create account","createAccountFailed":"Account create failed","createAccountSuccess":"Account create success","curUser":"Email","currentEmail":"Your current email is: \u003ccode\u003e%s\u003c/code\u003e ","datetime":"Datetime","default":"Default","defaultShare":"Default sharing","defaulthhare":"Default","delete":"Delete","deleteAllShared":"Delete shared user","deleteSharedNotebook":"Delete shared notebook","demoRegister":"\u003ca href=\"/register\"\u003eSign up\u003c/a\u003e","discussion":"Discussion","donate ":" Donate","download":"Download","editorTips":"Tips","editorTipsInfo":"\u003ch4\u003e1. Short cuts\u003c/h4\u003ectrl+shift+c Toggle code \u003cbr /\u003e ctrl+shift+i Insert/edit image \u003ch4\u003e2. shift+enter Get out of current block\u003c/h4\u003e eg. \u003cimg src=\"/images/outofcode.png\" style=\"width: 90px\"/\u003e in this situation you can use shift+enter to get out of current code block.","email":"Email","emailBodyRequired":"Email body is required","emailInSending":"In sending to ","emailOrOthers":"Email or other contact way","emailSendFailed":"Email send failed","errorEmail":"Please input the right email","errorPassword":"The passowd's length is at least 6 and be sure as complex as possible","findPassword":"Find password","findPasswordSendEmailOver":"We have already send the find password link to your email, please check out your email","findPasswordTimeout":"time out","fold":"Fold","forgetPassword ":" Forget password?","fork github":"Fork leanote on Github","friendEmail":"Friend email","friendNotExits":"Your friend hasn't %s's account, invite register link: %s","green":"green","hadAcount ":" Already have an account?","hasAcount ":" Do not have an account?","hi":"Hi","historiesNum":"We have saved at most \u003cb\u003e10\u003c/b\u003e latest histories with each note","history":"Histories","home":"Home","howToInstallLeanote":"How to install leanote","ing":"processing","inputEmail":"Email is required","inputFriendEmail":"Friend email is required","inputNewPassword":"The new password is required","inputPassword":"Password is required","inputPassword2":"Please input the new password again","inputUsername":"input username","inviteEmailBody":"Hi,I am %s, %s is awesome, come on!","knowledge":"Knowledge","knowledgeInfo":"Use leanote as a note, manage your knowledge in leanote.","leanoteBlog":"Blog","leftHidden":"Hidden slide bar","leftShow":"Show slide bar","login":"Sign in","loginSuccess":"login success","logining":"Sign in","logout":"Logout","minLength":"The length is at least %s","moto":"your own cloud note!","moto2":"Knowledge, Sharing, Cooperation, Blog... all in leanote","moto3":"Brief But Not Simple","move":"Move","myBlog":"Blog","myNote":"My note","myNotebook":"My notebook","myTag":"My tag","nav":"Note nav","new":"New","newMarkdown":"New markdown note","newMarkdownNote":"New Markdown Note","newNote":"New note","newPassword":"New password","noHistories":"No histories","noNoteNewNoteTips":"The notebook is empty, why not...","noSpecialChars":"username cannot contains special chars","normalMode":"Normal Mode","notFound":"This page cann't found.","notGoodPassword":"Tt's not a good password, the length is at least 6","notebook":"Notebook","oldPassword":"Old password","or":"or","password":"Password","password2":"Confirm your password","passwordTips":"The length is at least 6","permission":"Permission","publicAsBlog":"Public as blog","reFindPassword":"find password again","readOnly":"Read only","red":"red","register":"Sign up","registerSuccessAndRdirectToNote":"Register success, redirecting...","rename":"Rename","resendVerifiedEmail":"Resend verification email","restoreFromThisVersion":"Restore from this version","save":"Save","saveSuccess":"Save success","saving":"Saving","search":"Search","send":"Send","sendInviteEmailToYourFriend":"Send invite email to your friend","sendSuccess":"success","sendVerifiedEmail":"Send verification email","setAvatar":"Avatar","setUsername":"Set username","setUsernameTips":"Your current email is: \u003ccode\u003e%s\u003c/code\u003e. You can set a unique username. \u003cbr /\u003eUsername' length is at least 4 and cannot contains special characters.","share":"Share","shareInfo":"Share your knowledge to your friends in leanote.","shareToFriends":"Share to friends","simple":"Simple","submit":"submit","suggestions":"Suggestions","suggestionsInfo":"help us to improve our service.","tag":"Tag","themeSetting":"Theme","thirdCreateAcountTips":"You are using the 3th account to login %(app)s, you can create a %(app)s account too. \u003cbr /\u003eAfter you create %(app)s account, you can use the account and the 3th account to login %(app)s.","trash":"Trash","try":"Try it","unTitled":"UnTitled","unVerified":"Unverfied","unfold":"Unfold","update":"Update","updateEmail":"Update email","updateEmailTips":"You must verify the email after you update the email. The verified email will be your new account.","updatePassword":"Update password","updatePasswordSuccess":"Update password success","updatePasswordSuccessRedirectToLogin":"update password success and redirect to login page...","updateUsernameSuccess":"Update username success","uploadImage":"Upload image","use ":" Use","usernameIsExisted":"Username is already exists","usernameOrEmail":"Username or email","usernameSetting":"Update username","verified":"Verified","verifiedEmaiHasSent":"The verification email has been sent, please check your email.","verifiedNow":"Verify now","welcomeUseLeanote":"Welcome!","writable":"Writable","writingMode":"Writing Mode","wrongEmail":"Wrong email","wrongPassword":"Wrong password","wrongUsernameOrPassword":"Wrong username or password","yellow":"yellow","yourContact":"Your contact","yourSuggestions":"Suggestions"}; -function getMsg(key, data) { - var msg = MSG[key] - if(msg) { - if(data) { - if(!isArray(data)) { - data = [data]; - } - for(var i = 0; i < data.length; ++i) { - msg = msg.replace("%s", data[i]); - } - } - return msg; - } - return key; -} - -log(MSG); - -fs.readFile('index.html', function(err, data){ - var html = data.toString(); - // log(html); - // {{msg . "abc"}} - var reg = /{{ *msg +\. +"(.*?)" *}}/g; - while(res = reg.exec(html)) { - - log(res[0]); - var msg = getMsg(res[1]); - html = html.replace(res[0], msg); - } - log(html); - fs.writeFile('index2.html', html); -}); \ No newline at end of file diff --git a/login.html b/login.html index 53cb2b76..7815e1b9 100644 --- a/login.html +++ b/login.html @@ -17,7 +17,7 @@
- +
diff --git a/m/Traffic_lights_dark.psd b/m/Traffic_lights_dark.psd deleted file mode 100644 index f28fedd0..00000000 Binary files a/m/Traffic_lights_dark.psd and /dev/null differ diff --git a/m/Traffic_lights_light.psd b/m/Traffic_lights_light.psd deleted file mode 100644 index e14b2d1b..00000000 Binary files a/m/Traffic_lights_light.psd and /dev/null differ diff --git a/m/Traffic_lights_light_01.png b/m/Traffic_lights_light_01.png deleted file mode 100644 index fc6d8240..00000000 Binary files a/m/Traffic_lights_light_01.png and /dev/null differ diff --git a/m/Traffic_lights_light_02.png b/m/Traffic_lights_light_02.png deleted file mode 100644 index 38b2527a..00000000 Binary files a/m/Traffic_lights_light_02.png and /dev/null differ diff --git a/m/Traffic_lights_light_11.png b/m/Traffic_lights_light_11.png deleted file mode 100644 index df5b8d9c..00000000 Binary files a/m/Traffic_lights_light_11.png and /dev/null differ diff --git a/m/Traffic_lights_light_37.png b/m/Traffic_lights_light_37.png deleted file mode 100644 index a6b05a39..00000000 Binary files a/m/Traffic_lights_light_37.png and /dev/null differ diff --git a/m/Traffic_lights_light_43.png b/m/Traffic_lights_light_43.png deleted file mode 100644 index c831a714..00000000 Binary files a/m/Traffic_lights_light_43.png and /dev/null differ diff --git a/m/Traffic_lights_light_48.png b/m/Traffic_lights_light_48.png deleted file mode 100644 index 8cd8d216..00000000 Binary files a/m/Traffic_lights_light_48.png and /dev/null differ diff --git a/m/Traffic_lights_light_49.png b/m/Traffic_lights_light_49.png deleted file mode 100644 index 660320e4..00000000 Binary files a/m/Traffic_lights_light_49.png and /dev/null differ diff --git a/m/traffic-close-down-graphite.png b/m/traffic-close-down-graphite.png deleted file mode 100644 index 78dd3a73..00000000 Binary files a/m/traffic-close-down-graphite.png and /dev/null differ diff --git a/m/traffic-close-down-graphite@2x.png b/m/traffic-close-down-graphite@2x.png deleted file mode 100644 index 7d34727b..00000000 Binary files a/m/traffic-close-down-graphite@2x.png and /dev/null differ diff --git a/m/traffic-close-down.png b/m/traffic-close-down.png deleted file mode 100644 index 79d908b7..00000000 Binary files a/m/traffic-close-down.png and /dev/null differ diff --git a/m/traffic-close-down@2x.png b/m/traffic-close-down@2x.png deleted file mode 100644 index 06e42b9a..00000000 Binary files a/m/traffic-close-down@2x.png and /dev/null differ diff --git a/m/traffic-close-hover-graphite.png b/m/traffic-close-hover-graphite.png deleted file mode 100644 index dbc994fb..00000000 Binary files a/m/traffic-close-hover-graphite.png and /dev/null differ diff --git a/m/traffic-close-hover-graphite@2x.png b/m/traffic-close-hover-graphite@2x.png deleted file mode 100644 index aeb16fc6..00000000 Binary files a/m/traffic-close-hover-graphite@2x.png and /dev/null differ diff --git a/m/traffic-close-hover.png b/m/traffic-close-hover.png deleted file mode 100644 index 675e1777..00000000 Binary files a/m/traffic-close-hover.png and /dev/null differ diff --git a/m/traffic-close-hover@2x.png b/m/traffic-close-hover@2x.png deleted file mode 100644 index fe28fd9b..00000000 Binary files a/m/traffic-close-hover@2x.png and /dev/null differ diff --git a/m/traffic-close.png b/m/traffic-close.png deleted file mode 100644 index 8154a904..00000000 Binary files a/m/traffic-close.png and /dev/null differ diff --git a/m/traffic-close@2x.png b/m/traffic-close@2x.png deleted file mode 100644 index 124a4da8..00000000 Binary files a/m/traffic-close@2x.png and /dev/null differ diff --git a/m/traffic-disabled.png b/m/traffic-disabled.png deleted file mode 100644 index f361c8c2..00000000 Binary files a/m/traffic-disabled.png and /dev/null differ diff --git a/m/traffic-disabled@2x.png b/m/traffic-disabled@2x.png deleted file mode 100644 index da394963..00000000 Binary files a/m/traffic-disabled@2x.png and /dev/null differ diff --git a/m/traffic-fullscreen-down-graphite.png b/m/traffic-fullscreen-down-graphite.png deleted file mode 100644 index 1de6ae5b..00000000 Binary files a/m/traffic-fullscreen-down-graphite.png and /dev/null differ diff --git a/m/traffic-fullscreen-down-graphite@2x.png b/m/traffic-fullscreen-down-graphite@2x.png deleted file mode 100644 index 65e9952d..00000000 Binary files a/m/traffic-fullscreen-down-graphite@2x.png and /dev/null differ diff --git a/m/traffic-fullscreen-down.png b/m/traffic-fullscreen-down.png deleted file mode 100644 index 81fce2a9..00000000 Binary files a/m/traffic-fullscreen-down.png and /dev/null differ diff --git a/m/traffic-fullscreen-down@2x.png b/m/traffic-fullscreen-down@2x.png deleted file mode 100644 index e896c203..00000000 Binary files a/m/traffic-fullscreen-down@2x.png and /dev/null differ diff --git a/m/traffic-fullscreen-hover-graphite.png b/m/traffic-fullscreen-hover-graphite.png deleted file mode 100644 index 876ed2d2..00000000 Binary files a/m/traffic-fullscreen-hover-graphite.png and /dev/null differ diff --git a/m/traffic-fullscreen-hover-graphite@2x.png b/m/traffic-fullscreen-hover-graphite@2x.png deleted file mode 100644 index e0e4e346..00000000 Binary files a/m/traffic-fullscreen-hover-graphite@2x.png and /dev/null differ diff --git a/m/traffic-fullscreen-hover.png b/m/traffic-fullscreen-hover.png deleted file mode 100644 index be092380..00000000 Binary files a/m/traffic-fullscreen-hover.png and /dev/null differ diff --git a/m/traffic-fullscreen-hover@2x.png b/m/traffic-fullscreen-hover@2x.png deleted file mode 100644 index 58397143..00000000 Binary files a/m/traffic-fullscreen-hover@2x.png and /dev/null differ diff --git a/m/traffic-fullscreen.png b/m/traffic-fullscreen.png deleted file mode 100644 index f8065efa..00000000 Binary files a/m/traffic-fullscreen.png and /dev/null differ diff --git a/m/traffic-fullscreen@2x.png b/m/traffic-fullscreen@2x.png deleted file mode 100644 index 96e7e92d..00000000 Binary files a/m/traffic-fullscreen@2x.png and /dev/null differ diff --git a/m/traffic-graphite.png b/m/traffic-graphite.png deleted file mode 100644 index 059c6fd9..00000000 Binary files a/m/traffic-graphite.png and /dev/null differ diff --git a/m/traffic-graphite@2x.png b/m/traffic-graphite@2x.png deleted file mode 100644 index c6c99996..00000000 Binary files a/m/traffic-graphite@2x.png and /dev/null differ diff --git a/m/traffic-minimise-down-graphite.png b/m/traffic-minimise-down-graphite.png deleted file mode 100644 index 8110dfc2..00000000 Binary files a/m/traffic-minimise-down-graphite.png and /dev/null differ diff --git a/m/traffic-minimise-down-graphite@2x.png b/m/traffic-minimise-down-graphite@2x.png deleted file mode 100644 index 44a0cd06..00000000 Binary files a/m/traffic-minimise-down-graphite@2x.png and /dev/null differ diff --git a/m/traffic-minimise-down.png b/m/traffic-minimise-down.png deleted file mode 100644 index 3b5f68f7..00000000 Binary files a/m/traffic-minimise-down.png and /dev/null differ diff --git a/m/traffic-minimise-down@2x.png b/m/traffic-minimise-down@2x.png deleted file mode 100644 index 1f174927..00000000 Binary files a/m/traffic-minimise-down@2x.png and /dev/null differ diff --git a/m/traffic-minimise-hover-graphite.png b/m/traffic-minimise-hover-graphite.png deleted file mode 100644 index 134607ee..00000000 Binary files a/m/traffic-minimise-hover-graphite.png and /dev/null differ diff --git a/m/traffic-minimise-hover-graphite@2x.png b/m/traffic-minimise-hover-graphite@2x.png deleted file mode 100644 index c09f05c0..00000000 Binary files a/m/traffic-minimise-hover-graphite@2x.png and /dev/null differ diff --git a/m/traffic-minimise-hover.png b/m/traffic-minimise-hover.png deleted file mode 100644 index c1723fa1..00000000 Binary files a/m/traffic-minimise-hover.png and /dev/null differ diff --git a/m/traffic-minimise-hover@2x.png b/m/traffic-minimise-hover@2x.png deleted file mode 100644 index 59bb97bf..00000000 Binary files a/m/traffic-minimise-hover@2x.png and /dev/null differ diff --git a/m/traffic-minimise.png b/m/traffic-minimise.png deleted file mode 100644 index fd911ca8..00000000 Binary files a/m/traffic-minimise.png and /dev/null differ diff --git a/m/traffic-minimise@2x.png b/m/traffic-minimise@2x.png deleted file mode 100644 index c685b029..00000000 Binary files a/m/traffic-minimise@2x.png and /dev/null differ diff --git a/m/traffic-zoom-down-graphite.png b/m/traffic-zoom-down-graphite.png deleted file mode 100644 index 714ca24e..00000000 Binary files a/m/traffic-zoom-down-graphite.png and /dev/null differ diff --git a/m/traffic-zoom-down-graphite@2x.png b/m/traffic-zoom-down-graphite@2x.png deleted file mode 100644 index af303f23..00000000 Binary files a/m/traffic-zoom-down-graphite@2x.png and /dev/null differ diff --git a/m/traffic-zoom-down.png b/m/traffic-zoom-down.png deleted file mode 100644 index 6721ccc3..00000000 Binary files a/m/traffic-zoom-down.png and /dev/null differ diff --git a/m/traffic-zoom-down@2x.png b/m/traffic-zoom-down@2x.png deleted file mode 100644 index 81a3b3c9..00000000 Binary files a/m/traffic-zoom-down@2x.png and /dev/null differ diff --git a/m/traffic-zoom-hover-graphite.png b/m/traffic-zoom-hover-graphite.png deleted file mode 100644 index 149d9723..00000000 Binary files a/m/traffic-zoom-hover-graphite.png and /dev/null differ diff --git a/m/traffic-zoom-hover-graphite@2x.png b/m/traffic-zoom-hover-graphite@2x.png deleted file mode 100644 index 2deeceb1..00000000 Binary files a/m/traffic-zoom-hover-graphite@2x.png and /dev/null differ diff --git a/m/traffic-zoom-hover.png b/m/traffic-zoom-hover.png deleted file mode 100644 index 8c803d5c..00000000 Binary files a/m/traffic-zoom-hover.png and /dev/null differ diff --git a/m/traffic-zoom-hover@2x.png b/m/traffic-zoom-hover@2x.png deleted file mode 100644 index 7fda1b86..00000000 Binary files a/m/traffic-zoom-hover@2x.png and /dev/null differ diff --git a/main.js b/main.js deleted file mode 100755 index aeb46b3b..00000000 --- a/main.js +++ /dev/null @@ -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); - }); -}); diff --git a/node_modules/web.js b/node_modules/web.js index 36f7d7a3..98572974 100644 --- a/node_modules/web.js +++ b/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 + '
' + title); }, /* syncNotebookFinish: function() { diff --git a/public/css/css/black.css b/public/css/css/black.css deleted file mode 100644 index 6124f4b5..00000000 --- a/public/css/css/black.css +++ /dev/null @@ -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; -} diff --git a/public/css/icon/Traffic_lights_light.png b/public/css/icon/Traffic_lights_light.png new file mode 100644 index 00000000..24574b97 Binary files /dev/null and b/public/css/icon/Traffic_lights_light.png differ diff --git a/public/css/icon/Traffic_lights_light_01.png b/public/css/icon/Traffic_lights_light_01.png deleted file mode 100644 index 63928ad1..00000000 Binary files a/public/css/icon/Traffic_lights_light_01.png and /dev/null differ diff --git a/public/css/icon/Traffic_lights_light_02.png b/public/css/icon/Traffic_lights_light_02.png deleted file mode 100644 index d358d826..00000000 Binary files a/public/css/icon/Traffic_lights_light_02.png and /dev/null differ diff --git a/public/css/icon/Traffic_lights_light_11.png b/public/css/icon/Traffic_lights_light_11.png deleted file mode 100644 index ee5fb7b8..00000000 Binary files a/public/css/icon/Traffic_lights_light_11.png and /dev/null differ diff --git a/public/css/icon/Traffic_lights_light_37.png b/public/css/icon/Traffic_lights_light_37.png deleted file mode 100644 index 2d9afdd8..00000000 Binary files a/public/css/icon/Traffic_lights_light_37.png and /dev/null differ diff --git a/public/css/icon/Traffic_lights_light_43.png b/public/css/icon/Traffic_lights_light_43.png deleted file mode 100644 index 83e8d59d..00000000 Binary files a/public/css/icon/Traffic_lights_light_43.png and /dev/null differ diff --git a/public/css/icon/Traffic_lights_light_48.png b/public/css/icon/Traffic_lights_light_48.png deleted file mode 100644 index d34a605d..00000000 Binary files a/public/css/icon/Traffic_lights_light_48.png and /dev/null differ diff --git a/public/css/icon/Traffic_lights_light_49.png b/public/css/icon/Traffic_lights_light_49.png deleted file mode 100644 index 4ba6a355..00000000 Binary files a/public/css/icon/Traffic_lights_light_49.png and /dev/null differ diff --git a/public/css/index.css b/public/css/index.css index e9a9f25a..6e7e1cc1 100644 --- a/public/css/index.css +++ b/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); +} diff --git a/public/css/index.less b/public/css/index.less index 86e14f52..c8b8a8b6 100644 --- a/public/css/index.less +++ b/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"; diff --git a/public/css/theme/basic.less b/public/css/theme/basic.less index 3c393e05..2ada338b 100644 --- a/public/css/theme/basic.less +++ b/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'; diff --git a/public/css/theme/default.css b/public/css/theme/default.css index 441301f8..68426708 100644 --- a/public/css/theme/default.css +++ b/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; diff --git a/public/css/theme/icon/Traffic_lights_light.png b/public/css/theme/icon/Traffic_lights_light.png new file mode 100644 index 00000000..24574b97 Binary files /dev/null and b/public/css/theme/icon/Traffic_lights_light.png differ diff --git a/public/css/theme/icon/traffic-close-down-graphite.png b/public/css/theme/icon/traffic-close-down-graphite.png new file mode 100644 index 00000000..9b54719a Binary files /dev/null and b/public/css/theme/icon/traffic-close-down-graphite.png differ diff --git a/public/css/theme/icon/traffic-close-down-graphite@2x.png b/public/css/theme/icon/traffic-close-down-graphite@2x.png new file mode 100644 index 00000000..78c9d4b2 Binary files /dev/null and b/public/css/theme/icon/traffic-close-down-graphite@2x.png differ diff --git a/public/css/theme/icon/traffic-close-down.png b/public/css/theme/icon/traffic-close-down.png new file mode 100644 index 00000000..d9746d57 Binary files /dev/null and b/public/css/theme/icon/traffic-close-down.png differ diff --git a/public/css/theme/icon/traffic-close-down@2x.png b/public/css/theme/icon/traffic-close-down@2x.png new file mode 100644 index 00000000..81ff87ed Binary files /dev/null and b/public/css/theme/icon/traffic-close-down@2x.png differ diff --git a/public/css/theme/icon/traffic-close-hover-graphite.png b/public/css/theme/icon/traffic-close-hover-graphite.png new file mode 100644 index 00000000..a095cea5 Binary files /dev/null and b/public/css/theme/icon/traffic-close-hover-graphite.png differ diff --git a/public/css/theme/icon/traffic-close-hover-graphite@2x.png b/public/css/theme/icon/traffic-close-hover-graphite@2x.png new file mode 100644 index 00000000..786fa688 Binary files /dev/null and b/public/css/theme/icon/traffic-close-hover-graphite@2x.png differ diff --git a/public/css/theme/icon/traffic-close-hover.png b/public/css/theme/icon/traffic-close-hover.png new file mode 100644 index 00000000..4fc0fcc3 Binary files /dev/null and b/public/css/theme/icon/traffic-close-hover.png differ diff --git a/public/css/theme/icon/traffic-close-hover@2x.png b/public/css/theme/icon/traffic-close-hover@2x.png new file mode 100644 index 00000000..07b9f94d Binary files /dev/null and b/public/css/theme/icon/traffic-close-hover@2x.png differ diff --git a/public/css/theme/icon/traffic-close.png b/public/css/theme/icon/traffic-close.png new file mode 100644 index 00000000..41d98955 Binary files /dev/null and b/public/css/theme/icon/traffic-close.png differ diff --git a/public/css/theme/icon/traffic-close@2x.png b/public/css/theme/icon/traffic-close@2x.png new file mode 100644 index 00000000..a0157067 Binary files /dev/null and b/public/css/theme/icon/traffic-close@2x.png differ diff --git a/public/css/theme/icon/traffic-disabled.png b/public/css/theme/icon/traffic-disabled.png new file mode 100644 index 00000000..adc2f5c5 Binary files /dev/null and b/public/css/theme/icon/traffic-disabled.png differ diff --git a/public/css/theme/icon/traffic-disabled@2x.png b/public/css/theme/icon/traffic-disabled@2x.png new file mode 100644 index 00000000..826cb822 Binary files /dev/null and b/public/css/theme/icon/traffic-disabled@2x.png differ diff --git a/public/css/theme/icon/traffic-fullscreen-down-graphite.png b/public/css/theme/icon/traffic-fullscreen-down-graphite.png new file mode 100644 index 00000000..690129a9 Binary files /dev/null and b/public/css/theme/icon/traffic-fullscreen-down-graphite.png differ diff --git a/public/css/theme/icon/traffic-fullscreen-down-graphite@2x.png b/public/css/theme/icon/traffic-fullscreen-down-graphite@2x.png new file mode 100644 index 00000000..ac7e7904 Binary files /dev/null and b/public/css/theme/icon/traffic-fullscreen-down-graphite@2x.png differ diff --git a/public/css/theme/icon/traffic-fullscreen-down.png b/public/css/theme/icon/traffic-fullscreen-down.png new file mode 100644 index 00000000..15acca43 Binary files /dev/null and b/public/css/theme/icon/traffic-fullscreen-down.png differ diff --git a/public/css/theme/icon/traffic-fullscreen-down@2x.png b/public/css/theme/icon/traffic-fullscreen-down@2x.png new file mode 100644 index 00000000..5c9198d9 Binary files /dev/null and b/public/css/theme/icon/traffic-fullscreen-down@2x.png differ diff --git a/public/css/theme/icon/traffic-fullscreen-hover-graphite.png b/public/css/theme/icon/traffic-fullscreen-hover-graphite.png new file mode 100644 index 00000000..9123c634 Binary files /dev/null and b/public/css/theme/icon/traffic-fullscreen-hover-graphite.png differ diff --git a/public/css/theme/icon/traffic-fullscreen-hover-graphite@2x.png b/public/css/theme/icon/traffic-fullscreen-hover-graphite@2x.png new file mode 100644 index 00000000..ccb6fa6f Binary files /dev/null and b/public/css/theme/icon/traffic-fullscreen-hover-graphite@2x.png differ diff --git a/public/css/theme/icon/traffic-fullscreen-hover.png b/public/css/theme/icon/traffic-fullscreen-hover.png new file mode 100644 index 00000000..4b2ed2f3 Binary files /dev/null and b/public/css/theme/icon/traffic-fullscreen-hover.png differ diff --git a/public/css/theme/icon/traffic-fullscreen-hover@2x.png b/public/css/theme/icon/traffic-fullscreen-hover@2x.png new file mode 100644 index 00000000..0daee086 Binary files /dev/null and b/public/css/theme/icon/traffic-fullscreen-hover@2x.png differ diff --git a/public/css/theme/icon/traffic-fullscreen.png b/public/css/theme/icon/traffic-fullscreen.png new file mode 100644 index 00000000..1079c625 Binary files /dev/null and b/public/css/theme/icon/traffic-fullscreen.png differ diff --git a/public/css/theme/icon/traffic-fullscreen@2x.png b/public/css/theme/icon/traffic-fullscreen@2x.png new file mode 100644 index 00000000..edf1b40a Binary files /dev/null and b/public/css/theme/icon/traffic-fullscreen@2x.png differ diff --git a/public/css/theme/icon/traffic-graphite.png b/public/css/theme/icon/traffic-graphite.png new file mode 100644 index 00000000..5b95010e Binary files /dev/null and b/public/css/theme/icon/traffic-graphite.png differ diff --git a/public/css/theme/icon/traffic-graphite@2x.png b/public/css/theme/icon/traffic-graphite@2x.png new file mode 100644 index 00000000..3c8ab527 Binary files /dev/null and b/public/css/theme/icon/traffic-graphite@2x.png differ diff --git a/public/css/theme/icon/traffic-minimise-down-graphite.png b/public/css/theme/icon/traffic-minimise-down-graphite.png new file mode 100644 index 00000000..0c2653ed Binary files /dev/null and b/public/css/theme/icon/traffic-minimise-down-graphite.png differ diff --git a/public/css/theme/icon/traffic-minimise-down-graphite@2x.png b/public/css/theme/icon/traffic-minimise-down-graphite@2x.png new file mode 100644 index 00000000..eb9f252b Binary files /dev/null and b/public/css/theme/icon/traffic-minimise-down-graphite@2x.png differ diff --git a/public/css/theme/icon/traffic-minimise-down.png b/public/css/theme/icon/traffic-minimise-down.png new file mode 100644 index 00000000..a1f3055f Binary files /dev/null and b/public/css/theme/icon/traffic-minimise-down.png differ diff --git a/public/css/theme/icon/traffic-minimise-down@2x.png b/public/css/theme/icon/traffic-minimise-down@2x.png new file mode 100644 index 00000000..811dce5a Binary files /dev/null and b/public/css/theme/icon/traffic-minimise-down@2x.png differ diff --git a/public/css/theme/icon/traffic-minimise-hover-graphite.png b/public/css/theme/icon/traffic-minimise-hover-graphite.png new file mode 100644 index 00000000..deced288 Binary files /dev/null and b/public/css/theme/icon/traffic-minimise-hover-graphite.png differ diff --git a/public/css/theme/icon/traffic-minimise-hover-graphite@2x.png b/public/css/theme/icon/traffic-minimise-hover-graphite@2x.png new file mode 100644 index 00000000..106f03ec Binary files /dev/null and b/public/css/theme/icon/traffic-minimise-hover-graphite@2x.png differ diff --git a/public/css/theme/icon/traffic-minimise-hover.png b/public/css/theme/icon/traffic-minimise-hover.png new file mode 100644 index 00000000..37701b53 Binary files /dev/null and b/public/css/theme/icon/traffic-minimise-hover.png differ diff --git a/public/css/theme/icon/traffic-minimise-hover@2x.png b/public/css/theme/icon/traffic-minimise-hover@2x.png new file mode 100644 index 00000000..2d51ef50 Binary files /dev/null and b/public/css/theme/icon/traffic-minimise-hover@2x.png differ diff --git a/public/css/theme/icon/traffic-minimise.png b/public/css/theme/icon/traffic-minimise.png new file mode 100644 index 00000000..3cee54b6 Binary files /dev/null and b/public/css/theme/icon/traffic-minimise.png differ diff --git a/public/css/theme/icon/traffic-minimise@2x.png b/public/css/theme/icon/traffic-minimise@2x.png new file mode 100644 index 00000000..5b45ed7e Binary files /dev/null and b/public/css/theme/icon/traffic-minimise@2x.png differ diff --git a/public/css/theme/icon/traffic-zoom-down-graphite.png b/public/css/theme/icon/traffic-zoom-down-graphite.png new file mode 100644 index 00000000..baba2cf9 Binary files /dev/null and b/public/css/theme/icon/traffic-zoom-down-graphite.png differ diff --git a/public/css/theme/icon/traffic-zoom-down-graphite@2x.png b/public/css/theme/icon/traffic-zoom-down-graphite@2x.png new file mode 100644 index 00000000..dce6204d Binary files /dev/null and b/public/css/theme/icon/traffic-zoom-down-graphite@2x.png differ diff --git a/public/css/theme/icon/traffic-zoom-down.png b/public/css/theme/icon/traffic-zoom-down.png new file mode 100644 index 00000000..7bb3cf3e Binary files /dev/null and b/public/css/theme/icon/traffic-zoom-down.png differ diff --git a/public/css/theme/icon/traffic-zoom-down@2x.png b/public/css/theme/icon/traffic-zoom-down@2x.png new file mode 100644 index 00000000..0b55e5c9 Binary files /dev/null and b/public/css/theme/icon/traffic-zoom-down@2x.png differ diff --git a/public/css/theme/icon/traffic-zoom-hover-graphite.png b/public/css/theme/icon/traffic-zoom-hover-graphite.png new file mode 100644 index 00000000..f65d3f2a Binary files /dev/null and b/public/css/theme/icon/traffic-zoom-hover-graphite.png differ diff --git a/public/css/theme/icon/traffic-zoom-hover-graphite@2x.png b/public/css/theme/icon/traffic-zoom-hover-graphite@2x.png new file mode 100644 index 00000000..b50c9d79 Binary files /dev/null and b/public/css/theme/icon/traffic-zoom-hover-graphite@2x.png differ diff --git a/public/css/theme/icon/traffic-zoom-hover.png b/public/css/theme/icon/traffic-zoom-hover.png new file mode 100644 index 00000000..78097473 Binary files /dev/null and b/public/css/theme/icon/traffic-zoom-hover.png differ diff --git a/public/css/theme/icon/traffic-zoom-hover@2x.png b/public/css/theme/icon/traffic-zoom-hover@2x.png new file mode 100644 index 00000000..7698d24d Binary files /dev/null and b/public/css/theme/icon/traffic-zoom-hover@2x.png differ diff --git a/public/css/theme/simple.css b/public/css/theme/simple.css index 84aa1973..53499712 100644 --- a/public/css/theme/simple.css +++ b/public/css/theme/simple.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; diff --git a/public/css/theme/writting-overwrite.css b/public/css/theme/writting-overwrite.css index c4bd937d..55759420 100644 --- a/public/css/theme/writting-overwrite.css +++ b/public/css/theme/writting-overwrite.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); +} @font-face { font-family: 'Open Sans'; font-style: normal; diff --git a/public/css/theme/writting.css b/public/css/theme/writting.css index 01facf28..83b1b1fa 100644 --- a/public/css/theme/writting.css +++ b/public/css/theme/writting.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); +} @font-face { font-family: 'Open Sans'; font-style: normal; diff --git a/public/css/traffic.less b/public/css/traffic.less new file mode 100644 index 00000000..d87df01a --- /dev/null +++ b/public/css/traffic.less @@ -0,0 +1,63 @@ +.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); + // 为了预加载之 + &:before { + content: ' '; + background: url(icon/traffic-close-hover@2x.png); + } + } + .tool-close-blur { + background: url(icon/traffic-disabled@2x.png); + // 为了预加载之 + &:before { + content: ' '; + background: url(icon/traffic-close-hover@2x.png); + } + } + .tool-min { + background: url(icon/traffic-minimise@2x.png); + &:before { + content: ' '; + background: url(icon/traffic-minimise-hover@2x.png); + } + } + .tool-max { + background: url(icon/traffic-fullscreen@2x.png); + &:before { + content: ' '; + background: url(icon/traffic-zoom-hover@2x.png); + } + } + &:hover { + .tool-close, .tool-close-blur { + 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); + } + } +} + +.blur .win-tool { + a { + background: url(icon/traffic-disabled@2x.png); + } +} diff --git a/public/js/app/note.js b/public/js/app/note.js index 371283d5..b722d909 100644 --- a/public/js/app/note.js +++ b/public/js/app/note.js @@ -1153,7 +1153,9 @@ Note.fixNetOrAuthError = function() { } }; +// 同步进度显示 Note.syncProcess = function(msg) { + $('body').show(); $('#allProcess').hide(); $('#syncProcess').html(msg); }; diff --git a/public/js/app/page.js b/public/js/app/page.js index 3699cefa..209eed6d 100644 --- a/public/js/app/page.js +++ b/public/js/app/page.js @@ -1410,6 +1410,13 @@ function initPage() { }); }); + win.on('focus', function() { + $('body').removeClass('blur'); + }); + win.on('blur', function() { + $('body').addClass('blur'); + }); + // 注入前端变量# WebService.set(Notebook, Note, Attach, Tag); @@ -1465,7 +1472,8 @@ function initPage() { // 开始时显示loading...... // 隐藏mask $("#mainMask").html(""); - $("#mainMask").hide(100); + $("#mainMask").hide(0); + $('body').show(); }); }; diff --git a/public/js/app/service.js b/public/js/app/service.js index bd352d12..0f56cb2e 100644 --- a/public/js/app/service.js +++ b/public/js/app/service.js @@ -62,15 +62,14 @@ var win = gui.Window.get(); win.resizeTo(1100, 600); win.setPosition('center'); $(function() { - $('.tool-close').click(function() { + $('.tool-close, .tool-close-blur').click(function() { win.close(); }); - $('.tool-min').click(function() { + $('.tool-min, .tool-min-blur').click(function() { win.minimize(); }); - $('.tool-max').click(function() { + $('.tool-max, .tool-max-blur').click(function() { win.maximize(); - // win.toggleFullscreen(); // mac下是新屏幕 // 全屏模式 // win.toggleKioskMode(); @@ -80,13 +79,6 @@ $(function() { // bind close event // 保存当前打开的笔记 -win.on('focus', function() { - console.log('window is focused '); -}); -win.on('blur', function() { - console.log('not focuse '); -}); - function isURL(str_url) { var re = new RegExp("^((https|http|ftp|rtsp|mms|emailto)://).+"); return re.test(str_url); diff --git a/public/js/common.js b/public/js/common.js index 8070e353..11113e27 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -1397,6 +1397,16 @@ function commonCmd(e) { document.execCommand('cut'); } } -}; +} + +function loadToolIcons() { + var imgs = ['traffic-close-hover@2x.png', 'traffic-minimise-hover@2x.png', 'traffic-zoom-hover@2x.png']; + for(var i in imgs) { + var imageObj = new Image(); + imageObj.src = 'public/css/icon/' + imgs[i]; + } +} + +// loadToolIcons(); ContextTips.init(); \ No newline at end of file