Skip to content

Commit

Permalink
● 修复屏幕大小 bug
Browse files Browse the repository at this point in the history
  ● 修复 notification 显示 bug
  • Loading branch information
Alex committed Aug 8, 2017
1 parent 77817b9 commit 1fa868e
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 11 deletions.
3 changes: 2 additions & 1 deletion css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,8 @@
background-color: #fff;
box-shadow: 0 2px 4px rgba(0,0,0,.12),0 0 6px rgba(0,0,0,.04);
transition: opacity .3s,transform .3s,right .3s,top .4s;
overflow: hidden
overflow: hidden;
opacity: 0;
}

.notification .icon-circle-check {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h1 class="title current-tips" v-cloak>操作 {{ currentCategory }} 文件</h1>
<!-- <span class="loading-log">{{currentStatus}}</span> -->
</div>
<transition name="notification-fade">
<div v-show="isDone" class="notification" style="top: 16px; z-index: 2002;"><div class="notification__group notification__notitle"><h2 class="notification__title" style="display: none;">提示</h2><div class="notification__content">处理成功</div><div class="notification__closeBtn icon-close"></div></div></div>
<div v-show="isDone" class="notification" style="top: 16px; z-index: 9;" :style="{opacity: 1}"><div class="notification__group notification__notitle"><h2 class="notification__title" style="display: none;">提示</h2><div class="notification__content">处理成功</div><div class="notification__closeBtn icon-close"></div></div></div>
</transition>
</div>
<script type="text/javascript" src="./js/jquery-1.8.2.js"></script>
Expand Down
7 changes: 1 addition & 6 deletions js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ let defaultActions = [{
icon: 'html',
disabled: false,
isSolo: true,
wiki: 'https://github.com/SuperAL/splice/wiki/%E5%90%88%E5%B9%B6-css-js',
wiki: 'https://www.zybuluo.com/alexlee/note/841903',
configs: [{
type: 'custom-checkbox',
label: '是否压缩合并后的 js',
Expand Down Expand Up @@ -247,7 +247,6 @@ var app = new Vue({
actions: deepClone(storedActions ? storedActions : defaultActions),
currentCategory: '',
currentActions: [],
isVueLoading: true,
isLoading: false,
loadingMsg: '处理中...',
isDone: false,
Expand All @@ -271,10 +270,6 @@ var app = new Vue({
},
watch: {
isLoading(newVal) {
if (this.isVueLoading) {
this.isVueLoading = false;
return;
}
if (!newVal) {
let vm = this;
vm.isDone = true;
Expand Down
6 changes: 3 additions & 3 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const url = require('url')

// 开发时使用:自动更新
// build: 打包时需注释掉
require('electron-reload')(__dirname, { ignored: /node_modules|[\/\\]\./ });
// require('electron-reload')(__dirname, { ignored: /node_modules|[\/\\]\./ });


// Keep a global reference of the window object, if you don't, the window will
Expand All @@ -18,7 +18,7 @@ let mainWindow

function createWindow() {
// Create the browser window.
mainWindow = new BrowserWindow({ minWidth: 1000, minHeight: 650 })
mainWindow = new BrowserWindow({ width: 1000, height: 650, minWidth: 1000, minHeight: 650 })

// and load the index.html of the app.
mainWindow.loadURL(url.format({
Expand All @@ -32,7 +32,7 @@ function createWindow() {

// Open the DevTools.
// build: 打包时需注释掉
mainWindow.webContents.openDevTools()
// mainWindow.webContents.openDevTools()

// 快捷键 Ctrl+Alt+R 刷新页面
globalShortcut.register('Ctrl+Alt+R', function () {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"watch": "watchify js/es6.js -t babelify -o js/index.js --debug --verbose",
"quickexe": "electron-packager .",
"package": "electron-packager ./ DemoApps --overwrite --app-version=1.0.0 --platform=win32 --arch=all --out=../DemoApps --version=1.2.1 --icon=./public/img/app-icon.icns",
"pack:mac": "electron-packager ./ Splice --platform=darwin --arch=x64 --overwrite --out=../splice-dist/ --icon=icon/logo.icns --version 1.2.5 --ignore='(.DS_Store)'",
"pack:win": "electron-packager ./ Splice --platform=win32 --arch=x64 --overwrite --out=../splice-dist/ --icon=icon/logo.ico --version 1.2.5",
"pack:win32": "electron-packager ./ Splice --platform=win32 --arch=ia32 --overwrite --out=../splice-dist/ --icon=icon/logo.ico --version 1.2.5"
},
Expand Down

0 comments on commit 1fa868e

Please sign in to comment.