Commit 95f67ed7 by Torkel Ödegaard

minor fixes

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