Merge branch 'master' of github.com:thingsboard/thingsboard

ui/src/app/dashboard/dashboard.controller.js

@@ -138,10 +138,10 @@ export default function DashboardController(types, dashboardUtils, widgetService
     }
 
     vm.mainLayoutHeight = function() {
-        if (vm.isEditingWidget && vm.editingLayoutCtx.id === 'main') {
+        if (!vm.isEditingWidget || vm.editingLayoutCtx.id === 'main') {
             return '100%';
         } else {
-            return 'auto';
+            return '0px';
         }
     }
 
@@ -154,10 +154,10 @@ export default function DashboardController(types, dashboardUtils, widgetService
     }
 
     vm.rightLayoutHeight = function() {
-        if (vm.isEditingWidget && vm.editingLayoutCtx.id === 'right') {
+        if (!vm.isEditingWidget || vm.editingLayoutCtx.id === 'right') {
             return '100%';
         } else {
-            return 'auto';
+            return '0px';
         }
     }