Commit 8d00b029 authored by Michael Checo's avatar Michael Checo Committed by Chromium LUCI CQ

Diagnostics: Conform to responsiveness spec

Screenshot: http://shortn/_fvSN9f0N5B

Spec: https://carbon.googleplex.com/cros-ux/pages/diagnostics/mvp

Bug: 1125150
Test: browser_tests --gtest_filter=DiagnosticsApp*
Change-Id: I7cc40e2e25f10c700ffb92bbaefc52a5ec63be62
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2567930
Commit-Queue: Michael Checo <michaelcheco@google.com>
Reviewed-by: default avatarZentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: default avatarJesse Schettler <jschettler@chromium.org>
Reviewed-by: default avatarJoon Ahn <joonbug@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833516}
parent 2a07cc57
<style include="cr-shared-style diagnostics-shared diagnostics-fonts"> <style include="cr-shared-style diagnostics-shared diagnostics-fonts">
.card-width {
width: 100%;
}
.diagonstics-cards-container { .diagonstics-cards-container {
align-items: center; align-items: center;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-inline: var(--container-padding);
width: var(--content-container-width);
} }
#diagnosticsContainer { #diagnosticsContainer {
--cr-centered-card-max-width: 820px; align-items: center;
box-sizing: border-box;
display: flex;
flex-direction: column;
height: inherit;
position: relative;
} }
#header { #header {
@apply --diagnostics-header-font; @apply --diagnostics-header-font;
align-self: flex-start;
margin-bottom: 10px; margin-bottom: 10px;
} }
...@@ -31,23 +43,29 @@ ...@@ -31,23 +43,29 @@
padding: 5px; padding: 5px;
} }
</style> </style>
<div id="diagnosticsContainer"class="cr-centered-card-container"> <div id="diagnosticsContainer">
<div id="header">[[i18n('diagnosticsTitle')]]</div> <div id="header">[[i18n('diagnosticsTitle')]]</div>
<div class="overview-container"> <div class="overview-container">
<overview-card id="overviewCard"></overview-card> <overview-card id="overviewCard"></overview-card>
</div> </div>
<div class="diagonstics-cards-container"> <div class="diagonstics-cards-container">
<template is="dom-if" if="[[showBatteryStatusCard_]]" restamp> <template is="dom-if" if="[[showBatteryStatusCard_]]" restamp>
<battery-status-card id="batteryStatusCard" <div class="card-width">
is-test-running="{{isTestRunning}}"> <battery-status-card id="batteryStatusCard"
</battery-status-card> is-test-running="{{isTestRunning}}">
</battery-status-card>
</div>
</template> </template>
<cpu-card id="cpuCard" <div class="card-width">
is-test-running="{{isTestRunning}}"> <cpu-card id="cpuCard"
</cpu-card> is-test-running="{{isTestRunning}}">
<memory-card id="memoryCard" </cpu-card>
is-test-running="{{isTestRunning}}"> </div>
</memory-card> <div class="card-width">
<memory-card id="memoryCard"
is-test-running="{{isTestRunning}}">
</memory-card>
</div>
</div> </div>
<div class="session-log-container"> <div class="session-log-container">
<cr-button class="session-log-button"> <cr-button class="session-log-button">
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: 12px; margin-top: 12px;
width: 650px;
} }
.card-header { .card-header {
......
...@@ -19,6 +19,46 @@ ...@@ -19,6 +19,46 @@
padding-inline-start: 20px; padding-inline-start: 20px;
position: relative; position: relative;
top: 12%; top: 12%;
} }
@media (min-width:600px) {
:host {
--container-padding: 24px;
--content-container-width: 552px;
--chart-width: 452px;
}
}
@media (min-width:768px) {
:host {
--container-padding: 64px;
--content-container-width: 640px;
--chart-width: 540px;
}
}
@media (min-width:960px) {
:host {
--container-padding: 160px;
--content-container-width: 640px;
--chart-width: 540px;
}
}
@media (min-width:1280px) {
:host {
--container-padding: 160px;
--content-container-width: 680px;
--chart-width: 580px;
}
}
@media (min-width:1440px) {
:host {
--container-padding: 360px;
--content-container-width: 720px;
--chart-width: 620px;
}
}
</style> </style>
</template> </template>
...@@ -138,6 +138,8 @@ Polymer({ ...@@ -138,6 +138,8 @@ Polymer({
} }
}, },
observers: ['setScaling_(graphWidth_)'],
/** @override */ /** @override */
created() { created() {
// Initialize the data array with data outside the chart boundary. // Initialize the data array with data outside the chart boundary.
...@@ -150,6 +152,19 @@ Polymer({ ...@@ -150,6 +152,19 @@ Polymer({
ready() { ready() {
this.setScaling_(); this.setScaling_();
this.initializeChart_(); this.initializeChart_();
window.addEventListener('resize', (e) => this.updateChartWidth_());
// Set the initial chart width.
this.updateChartWidth_();
},
/** @private */
updateChartWidth_() {
// TODO(michaelcheco): Enforce 600px as the minimum window size.
// parseFloat() is used to convert the string returned by
// getComputedStyleValue() into a number ("642px" --> 642).
this.width_ = parseFloat(this.getComputedStyleValue('--chart-width'));
}, },
/** /**
......
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