Merge branch 'master' into develop

# Conflicts:
#	package.json

Author: engelgabriel

src/public/app.html

@@ -67,6 +67,9 @@ <h2>Enter your server URL</h2>
 			</footer>
 		</div>
 	</section>
+	<div class="drag-region left-nav"></div>
+	<div class="drag-region right-nav"></div>
+	<div class="drag-region top-bar"></div>
 
 	<script src="../app.js"></script>
 </body>

src/scripts/menus/window.js

@@ -1,4 +1,5 @@
 import { remote } from 'electron';
+import webview from '../webview';
 import servers from '../servers';
 const isMac = process.platform === 'darwin';
 
@@ -28,6 +29,7 @@ const macWindowTemplate = [
             var mainWindow = remote.getCurrentWindow();
             mainWindow.show();
             servers.clearActive();
+            webview.showLanding();
         }
     },
     {
@@ -53,6 +55,7 @@ const windowTemplate = [
         accelerator: 'Ctrl+N',
         click: function () {
             servers.clearActive();
+            webview.showLanding();
         }
     },
     {

src/scripts/start.js

@@ -158,8 +158,8 @@ export var start = function () {
     });
 
     $('.add-server').on('click', function () {
-        webview.loaded();
         servers.clearActive();
+        webview.showLanding();
     });
 
     servers.restoreActive();

src/scripts/webview.js

@@ -161,6 +161,12 @@ class WebView extends EventEmitter {
         while (!(item = this.getActive()) === false) {
             item.classList.remove('active');
         }
+        document.querySelector('.landing-page').classList.add('hide');
+    }
+
+    showLanding () {
+        this.loaded();
+        document.querySelector('.landing-page').classList.remove('hide');
     }
 
     setActive (hostUrl) {

src/stylesheets/main.less

@@ -310,4 +310,34 @@ input[type='password'] {
 	.landing-page {
 		left: 0;
 	}
+
+	.drag-region.left-nav {
+		left: 0;
+	}
+}
+
+.drag-region {
+	position: absolute;
+	-webkit-app-region: drag;
+
+	&.left-nav {
+		@media(max-width: 860px) {
+			width: 20px;
+		}
+
+		width: 260px;
+		height: 100%;
+		left: 80px;
+	}
+
+	&.right-nav {
+		width: 40px;
+		height: 100%;
+		right: 0;
+	}
+
+	&.top-bar {
+		height: 20px;
+		width: 100%;
+	}
 }

src/stylesheets/start-page.less

@@ -241,9 +241,8 @@ webview.active {
 .landing-page {
 	z-index: 1;
 	-webkit-app-region: drag;
-}
 
-body,
-html {
-	-webkit-app-region: drag;
+	&.hide {
+		display: none;
+	}
 }