Commit ec39c15e37cae60cfccaa487223cfee3fe976840
Merge branch 'master' of github.com:thingsboard/thingsboard
Showing
1 changed file
with
4 additions
and
4 deletions
| @@ -138,10 +138,10 @@ export default function DashboardController(types, dashboardUtils, widgetService | @@ -138,10 +138,10 @@ export default function DashboardController(types, dashboardUtils, widgetService | ||
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | vm.mainLayoutHeight = function() { | 140 | vm.mainLayoutHeight = function() { |
| 141 | - if (vm.isEditingWidget && vm.editingLayoutCtx.id === 'main') { | 141 | + if (!vm.isEditingWidget || vm.editingLayoutCtx.id === 'main') { |
| 142 | return '100%'; | 142 | return '100%'; |
| 143 | } else { | 143 | } else { |
| 144 | - return 'auto'; | 144 | + return '0px'; |
| 145 | } | 145 | } |
| 146 | } | 146 | } |
| 147 | 147 | ||
| @@ -154,10 +154,10 @@ export default function DashboardController(types, dashboardUtils, widgetService | @@ -154,10 +154,10 @@ export default function DashboardController(types, dashboardUtils, widgetService | ||
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | vm.rightLayoutHeight = function() { | 156 | vm.rightLayoutHeight = function() { |
| 157 | - if (vm.isEditingWidget && vm.editingLayoutCtx.id === 'right') { | 157 | + if (!vm.isEditingWidget || vm.editingLayoutCtx.id === 'right') { |
| 158 | return '100%'; | 158 | return '100%'; |
| 159 | } else { | 159 | } else { |
| 160 | - return 'auto'; | 160 | + return '0px'; |
| 161 | } | 161 | } |
| 162 | } | 162 | } |
| 163 | 163 |