Merge branch 'panel-edit-in-react' into develop

bd89b4e6 · Torkel Ödegaard · 9404d36a · c99861a7 · bd89b4e6
Commit bd89b4e6 authored Dec 03, 2018 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletions

public/sass/components/_dashboard_grid.scss
+7 -1

No files found.
--- a/public/sass/components/_dashboard_grid.scss
+++ b/public/sass/components/_dashboard_grid.scss
@@ -3,7 +3,13 @@

 .panel-in-fullscreen {
  .react-grid-layout {
-    height: calc(100% - 20px) !important;
+    height: 100% !important;
+  }
+
+  .dashboard-container--has-submenu {
+    .react-grid-layout {
+      height: calc(100% - 50px) !important;
+    }
  }

  .react-grid-item {