From a58ecf7e1943fa9b43318f7c1c71821c25d01010 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Wed, 20 Feb 2019 13:12:22 +0800
Subject: [PATCH 1/2] below nav approach

---
 src/windows/windows.es6 | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/windows/windows.es6 b/src/windows/windows.es6
index 06fff30993..b24e2912f6 100644
--- a/src/windows/windows.es6
+++ b/src/windows/windows.es6
@@ -341,16 +341,11 @@ export const createBlankWindow = function($html,options) {
    });
 
    dialog.bind('dialogextendmaximize', () => {
-      dialog.css({ zIndex: dialog.closest('.ui-dialog').css('z-index')*1 + 3000 });
+      dialog.css({ top: $('nav').height() });
    });
    dialog.bind('dialogextendrestore', () => {
-      if (dialog.closest('.ui-dialog').css('z-index') > 3000) {
-         dialog.css({ zIndex: dialog.closest('.ui-dialog').css('z-index')*1 - 3000 });
-         dialog.draggable('option', 'containment', false);
-      } else {
-         dialog.css({ zIndex: dialog.closest('.ui-dialog').css('z-index')*1 + 1 });
-      }
-   });
+      dialog.draggable( 'option', 'containment', false );
+   })
 
    if(options.destroy) { /* register for destroy event which have been patched */
       blankWindow.on('dialogdestroy', options.destroy);

From 381f345f2c17a1d23f8aed74ed7df4ed6a810b91 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Wed, 20 Feb 2019 15:11:52 +0800
Subject: [PATCH 2/2] revert change navbar fixed

---
 src/main.css                   |  4 ++++
 src/navigation/navigation.scss |  2 --
 src/windows/windows.es6        | 13 +++----------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main.css b/src/main.css
index c5d71e3292..ca7c7f3319 100755
--- a/src/main.css
+++ b/src/main.css
@@ -603,6 +603,10 @@ label.checkbox input:checked ~ span.check {
     z-index: +1;
 }
 
+.ui-icon-caret-1-e {
+    left: auto !important;
+}
+
 .ui-icon-caret-1-e:after {
     content: "»";
     font-family: roboto, sans-serif !important;
diff --git a/src/navigation/navigation.scss b/src/navigation/navigation.scss
index 2d6bd22586..127c5ef7e4 100644
--- a/src/navigation/navigation.scss
+++ b/src/navigation/navigation.scss
@@ -1,7 +1,5 @@
 nav {
-   position: fixed;
    width: 100%;
-   z-index: 3000;
 
    #topbar {
       width: 100%;
diff --git a/src/windows/windows.es6 b/src/windows/windows.es6
index b24e2912f6..73b2839e36 100644
--- a/src/windows/windows.es6
+++ b/src/windows/windows.es6
@@ -331,22 +331,15 @@ export const createBlankWindow = function($html,options) {
    dialog.on('dragstop', () => {
       const top = dialog.offset().top;
       const left = dialog.offset().left;
-      const nav_head = $('nav').height();
-      if(top < nav_head) {
-         dialog.animate({ top: nav_head }, 300, dialog.trigger.bind(dialog, 'animated'));
+
+      if (top < 0) {
+         dialog.animate({ top: '0px' }, 300, dialog.trigger.bind(dialog, 'animated'));
       }
       if (left < 0) {
          dialog.animate({ left: '0px' }, 300, dialog.trigger.bind(dialog, 'animated'));
       }
    });
 
-   dialog.bind('dialogextendmaximize', () => {
-      dialog.css({ top: $('nav').height() });
-   });
-   dialog.bind('dialogextendrestore', () => {
-      dialog.draggable( 'option', 'containment', false );
-   })
-
    if(options.destroy) { /* register for destroy event which have been patched */
       blankWindow.on('dialogdestroy', options.destroy);
    }