Merge remote-tracking branch 'origin/develop'

.gitignore

@@ -5,4 +5,4 @@ app/*
 npm-debug.log
 .idea/
 *.iml
-
+package-lock.json

package.json

@@ -51,19 +51,19 @@
   },
   "license": "MIT",
   "dependencies": {
-    "antd": "^3.3.3",
+    "antd": "^3.4.1",
     "axios": "^0.18.0",
     "mirrorx": "^0.2.10",
-    "react": "^16.3.0",
-    "react-dom": "^16.3.0"
+    "react": "^16.3.1",
+    "react-dom": "^16.3.1"
   },
   "devDependencies": {
     "ansi-html": "0.0.7",
     "autoprefixer": "^8.1.0",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.4",
     "babel-minify-webpack-plugin": "^0.3.0",
-    "babel-plugin-import": "^1.6.7",
+    "babel-plugin-import": "^1.7.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",
@@ -84,7 +84,7 @@
     "file-loader": "^1.1.11",
     "fix-path": "^2.1.0",
     "fs-extra": "^5.0.0",
-    "html-webpack-plugin": "^3.0.6",
+    "html-webpack-plugin": "^3.2.0",
     "install": "^0.10.4",
     "less": "^3.0.1",
     "less-loader": "^4.1.0",

src/renderer/App.jsx

@@ -7,8 +7,7 @@ import { Route, Router, NavLink } from 'mirrorx';
 import { Layout, Menu, Icon } from 'antd';
 import { ipcRenderer } from 'electron';
 import pkg from '../../package.json';
-import CloseButton from 'components/CloseButton';
-import SiderLeft from 'components/SiderLeft';
+// import CloseButton from 'components/CloseButton';
 import Routes from './routes';
 import './App.less';
 const { Header, Content, Footer, Sider } = Layout;

src/renderer/App.less

@@ -19,7 +19,10 @@
 button {
     -webkit-app-region: no-drag;
 }
-
+.ant-layout-header{
+    background: #fff;
+    padding:0;
+}
 .ant-layout {
     background-color: #fff;
 }