Merge branch 'monitoring-dashboard-fine-tuning-ux' into 'master'

Improve the overall UX for the new monitoring dashboard

See merge request !12616
This commit is contained in:
Phil Hughes 2017-07-05 08:28:44 +00:00
commit dddfa49db6
4 changed files with 26 additions and 10 deletions

View File

@ -35,7 +35,7 @@
data() {
return {
graphHeight: 500,
graphHeight: 450,
graphWidth: 600,
graphHeightOffset: 120,
xScale: {},
@ -88,7 +88,9 @@
},
paddingBottomRootSvg() {
return (Math.ceil(this.graphHeight * 100) / this.graphWidth) || 0;
return {
paddingBottom: `${(Math.ceil(this.graphHeight * 100) / this.graphWidth) || 0}%`,
};
},
},
@ -198,7 +200,7 @@
watch: {
updateAspectRatio() {
if (this.updateAspectRatio) {
this.graphHeight = 500;
this.graphHeight = 450;
this.graphWidth = 600;
this.measurements = measurements.large;
this.draw();
@ -216,14 +218,14 @@
<div
:class="classType">
<h5
class="text-center">
class="text-center graph-title">
{{columnData.title}}
</h5>
<div
class="prometheus-svg-container">
<div
class="prometheus-svg-container"
:style="paddingBottomRootSvg">
<svg
:viewBox="outterViewBox"
:style="{ 'padding-bottom': paddingBottomRootSvg }"
ref="baseSvg">
<g
class="x-axis"

View File

@ -254,7 +254,7 @@
.text-metric-usage {
fill: $black;
font-weight: 500;
font-size: 14px;
font-size: 12px;
}
.legend-axis-text {
@ -262,7 +262,11 @@
}
.tick > text {
font-size: 14px;
font-size: 12px;
}
.text-metric-title {
font-size: 12px;
}
@media (max-width: $screen-sm-max) {
@ -277,3 +281,9 @@
}
}
}
.prometheus-row {
h5 {
font-size: 16px;
}
}

View File

@ -10,7 +10,7 @@
.top-area
.row
.col-sm-6
%h3.page-title
%h3
Environment:
= link_to @environment.name, environment_path(@environment)

View File

@ -0,0 +1,4 @@
---
title: Improve the overall UX for the new monitoring dashboard
merge_request:
author: