Commit c06d15745da58c5fa8299dd52ec2153017f12a7a

Authored by Igor Kulikov
2 parents 0c0b3dad 8d7fe505

Merge branch 'master' into feature/TB-61

@@ -140,10 +140,10 @@ export default function DashboardController(types, utils, dashboardUtils, widget @@ -140,10 +140,10 @@ export default function DashboardController(types, utils, dashboardUtils, widget
140 } 140 }
141 141
142 vm.mainLayoutHeight = function() { 142 vm.mainLayoutHeight = function() {
143 - if (vm.isEditingWidget && vm.editingLayoutCtx.id === 'main') { 143 + if (!vm.isEditingWidget || vm.editingLayoutCtx.id === 'main') {
144 return '100%'; 144 return '100%';
145 } else { 145 } else {
146 - return 'auto'; 146 + return '0px';
147 } 147 }
148 } 148 }
149 149
@@ -156,10 +156,10 @@ export default function DashboardController(types, utils, dashboardUtils, widget @@ -156,10 +156,10 @@ export default function DashboardController(types, utils, dashboardUtils, widget
156 } 156 }
157 157
158 vm.rightLayoutHeight = function() { 158 vm.rightLayoutHeight = function() {
159 - if (vm.isEditingWidget && vm.editingLayoutCtx.id === 'right') { 159 + if (!vm.isEditingWidget || vm.editingLayoutCtx.id === 'right') {
160 return '100%'; 160 return '100%';
161 } else { 161 } else {
162 - return 'auto'; 162 + return '0px';
163 } 163 }
164 } 164 }
165 165