From d63c17dc2431dfc89d87cbdef4a8e852b459e03e Mon Sep 17 00:00:00 2001
From: rsercano <ozdemirsercan27@gmail.com>
Date: Fri, 12 May 2017 16:10:38 +0200
Subject: [PATCH] resolves #360

---
 client/imports/views/layouts/main/main.js        |  6 +-----
 .../views/layouts/top_navbar/top_navbar.js       | 16 ++++++++++++----
 client/stylesheets/globals/media.import.less     |  3 +--
 .../stylesheets/globals/navigation.import.less   |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/client/imports/views/layouts/main/main.js b/client/imports/views/layouts/main/main.js
index ffced06..5b9f7c4 100644
--- a/client/imports/views/layouts/main/main.js
+++ b/client/imports/views/layouts/main/main.js
@@ -69,11 +69,7 @@ const doUIStuff = function () {
 
     nav.resizable();
     nav.on('resize', function () {
-        if (!window.matchMedia('(max-width: 768px)').matches) {
-            pageWrapper.css('margin', '0 0 0 ' + nav.width() + 'px');
-        } else {
-            pageWrapper.css('margin', '0');
-        }
+        pageWrapper.css('margin', '0 0 0 ' + nav.width() + 'px');
     });
 };
 
diff --git a/client/imports/views/layouts/top_navbar/top_navbar.js b/client/imports/views/layouts/top_navbar/top_navbar.js
index a1f3359..4ca349e 100644
--- a/client/imports/views/layouts/top_navbar/top_navbar.js
+++ b/client/imports/views/layouts/top_navbar/top_navbar.js
@@ -195,6 +195,9 @@ Template.topNavbar.events({
 
         let body = $('body');
         let sideMenu = $('#side-menu');
+        const nav = $('.navbar-static-side');
+        const pageWrapper = $('#page-wrapper');
+
         // Toggle special class
         body.toggleClass("mini-navbar");
 
@@ -210,14 +213,19 @@ Template.topNavbar.events({
         } else if (body.hasClass('fixed-sidebar')) {
             console.log('2');
             sideMenu.hide();
-            setTimeout(
-                function () {
-                    sideMenu.fadeIn(400);
-                }, 100);
+            setTimeout(function () {
+                sideMenu.fadeIn(400);
+            }, 100);
         } else {
             // Remove all inline style from jquery fadeIn  to reset menu state
             sideMenu.removeAttr('style');
         }
+
+        setTimeout(function () {
+            nav.removeAttr('style');
+            if (nav.css('display') === 'block') pageWrapper.css('margin', '0 0 0 ' + nav.width() + 'px');
+            if (nav.css('display') === 'none') pageWrapper.css('margin', '0');
+        }, 300);
     },
 
     'click #btnConnect' () {
diff --git a/client/stylesheets/globals/media.import.less b/client/stylesheets/globals/media.import.less
index edbac7d..b6c276d 100755
--- a/client/stylesheets/globals/media.import.less
+++ b/client/stylesheets/globals/media.import.less
@@ -79,8 +79,7 @@
     display: block;
   }
 
-  .navbar-static-side { display: none; }
-
+  //.navbar-static-side { display: none; }
   body:not(.mini-navbar) {
     -webkit-transition: background-color 500ms linear;
     -moz-transition: background-color 500ms linear;
diff --git a/client/stylesheets/globals/navigation.import.less b/client/stylesheets/globals/navigation.import.less
index dcc2a20..68236b6 100755
--- a/client/stylesheets/globals/navigation.import.less
+++ b/client/stylesheets/globals/navigation.import.less
@@ -126,7 +126,7 @@
 }
 
 .navbar-top-links .dropdown-alerts {
-  margin-left: -123px;
+  // margin-left: -123px;
 }
 
 .navbar-top-links .dropdown-user {
-- 
GitLab