@@ -656,14 +656,19 @@ export class DashboardModel {
height = Math.ceil(height / CELL_HEIGHT);
for (let panel of row.panels) {
+ // should wrap to next row?
+ if (xPos + panel.span >= 12) {
+ yPos += height;
+ }
+
panel.x = xPos;
panel.y = yPos;
panel.width = panel.span;
panel.height = height;
- xPos += panel.width;
-
this.panels.push(panel);
+ xPos += panel.width;
}
yPos += height;
@@ -12,7 +12,7 @@
"title": "Home Dashboard",
"collapse": false,
"editable": true,
- "height": "25px",
+ "height": 150,
"panels": [
{
"content": "<div class=\"text-center dashboard-header\">\n <span>Home Dashboard</span>\n</div>",
@@ -23,7 +23,6 @@
right: 5px;
bottom: 0;
width: auto;
- z-index: 0 !important;
text-align: center;
@@ -41,8 +40,6 @@
right: 7px;
- overflow-x: hidden;
- overflow-y: auto;
.grid-stack > .grid-stack-item > .ui-resizable-handle {
@@ -33,11 +33,6 @@ div.flot-text {
-.panel-margin {
- margin: 0 0.4rem 0.8rem 0.4rem;
- //display: block;
-}
.panel-container {
background-color: $panel-bg;
position: relative;