From c6865abb40f03428667506e4da8632c292894c90 Mon Sep 17 00:00:00 2001 From: life Date: Sun, 22 May 2016 22:40:28 +0800 Subject: [PATCH] new logo --- login.html | 3 +-- main.js | 7 +++++- note.html | 4 ++-- public/config.js | 2 +- public/css/ani.less | 24 +++++++++++++------ public/css/index.css | 23 +++++++++++------- public/css/index.less | 6 +++-- public/images/logo/leanote-icon-en.png | Bin 0 -> 6156 bytes public/images/logo/leanote-icon-zh.png | Bin 0 -> 7309 bytes public/images/logo/leanote_icon_blue.png | Bin 18002 -> 33019 bytes public/images/logo/leanote_icon_blue_png.png | Bin 10930 -> 0 bytes public/js/app/page.js | 20 ++++++++++------ public/js/app/service_login.js | 2 +- public/js/common.js | 8 +++++-- public/js/lang.js | 2 ++ public/themes/default.css | 18 ++++++++------ 16 files changed, 79 insertions(+), 40 deletions(-) create mode 100644 public/images/logo/leanote-icon-en.png create mode 100644 public/images/logo/leanote-icon-zh.png delete mode 100644 public/images/logo/leanote_icon_blue_png.png diff --git a/login.html b/login.html index c57cf42d..f82cc92b 100644 --- a/login.html +++ b/login.html @@ -41,9 +41,8 @@ if(process.platform != 'darwin') {

- Self-hosted Service

diff --git a/main.js b/main.js index 1bc49ec9..d52b28d3 100644 --- a/main.js +++ b/main.js @@ -33,7 +33,8 @@ app.on('open-file', function(e) { }); // var appIsReady = false; -app.on('activate-with-no-open-windows', function() { +app.on('activate', function() { + console.log('activate'); if(mainWindow) { mainWindow.show(); } @@ -110,6 +111,7 @@ function openIt() { // Emitted when the window is closed. mainWindow.on('closed', function() { + console.log('closed'); // Dereference the window object, usually you would store windows // in an array if your app supports multi windows, this is the time // when you should delete the corresponding element. @@ -117,17 +119,20 @@ function openIt() { }); mainWindow.on('focus', function() { + console.log('focus'); // ipc.send('focusWindow'); mainProcess没有该方法 if(mainWindow && mainWindow.webContents) mainWindow.webContents.send('focusWindow'); }); mainWindow.on('blur', function() { + console.log('blur'); if(mainWindow && mainWindow.webContents) mainWindow.webContents.send('blurWindow'); }); // 关闭,先保存数据 mainWindow.on('close', function(e) { + console.log('close'); mainWindow.hide(); e.preventDefault(); mainWindow.webContents.send('closeWindow'); diff --git a/note.html b/note.html index 9dafe948..16f50cf5 100755 --- a/note.html +++ b/note.html @@ -73,8 +73,8 @@ function log(o) {
-