Commit 931e9bb1 authored by Michael Checo's avatar Michael Checo Committed by Chromium LUCI CQ

Diagnostics: data points section styling

Screenshot: http://shortn/_ldNJuxuRhF

Spec: https://carbon.googleplex.com/cros-ux/pages/diagnostics/mvp#dd35f9cb-3d67-452e-a98c-89635d8c31c3

Bug: 1125150
Test: browser_tests --gtest_filter=DiagnosticsApp*
Change-Id: I4756e38037d8ba4ba9ed9435f2f6a6a21d0e4b05
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2557728
Commit-Queue: Michael Checo <michaelcheco@google.com>
Reviewed-by: default avatarZentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: default avatarJoon Ahn <joonbug@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841720}
parent 3febdf47
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
<data-point slot="body" id="batteryHealth" <data-point slot="body" id="batteryHealth"
header="[[i18n('batteryHealthLabel')]]" header="[[i18n('batteryHealthLabel')]]"
value="[[getBatteryHealth_(batteryHealth_.batteryWearPercentage)]]" value="[[getBatteryHealth_(batteryHealth_.batteryWearPercentage)]]"
tooltip-text="[[i18n('batteryHealthTooltipText')]]"> tooltip-text="[[i18n('batteryHealthTooltipText')]]"
class="data-point-margin-start">
</data-point> </data-point>
<div slot="body" class="divider"></div> <div slot="body" class="divider"></div>
<data-point slot="body" id="cycleCount" header="[[i18n('cycleCount')]]" <data-point slot="body" id="cycleCount" header="[[i18n('cycleCount')]]"
...@@ -24,7 +25,8 @@ ...@@ -24,7 +25,8 @@
<div slot="body" class="divider"></div> <div slot="body" class="divider"></div>
<data-point slot="body" id="currentNow" header="[[i18n('currentNowLabel')]]" <data-point slot="body" id="currentNow" header="[[i18n('currentNowLabel')]]"
value="[[getCurrentNow_(batteryChargeStatus_.currentNowMilliamps)]]" value="[[getCurrentNow_(batteryChargeStatus_.currentNowMilliamps)]]"
tooltip-text="[[i18n('currentNowTooltipText')]]"> tooltip-text="[[i18n('currentNowTooltipText')]]"
class="data-point-margin-end">
</data-point> </data-point>
<routine-section slot="routines" routines="[[routines_]]" <routine-section slot="routines" routines="[[routines_]]"
......
...@@ -14,14 +14,16 @@ ...@@ -14,14 +14,16 @@
header="[[i18n('cpuUsageLabel')]]" header="[[i18n('cpuUsageLabel')]]"
value="[[getCurrentlyUsing_(cpuUsage_.percentUsageSystem, value="[[getCurrentlyUsing_(cpuUsage_.percentUsageSystem,
cpuUsage_.percentUsageUser)]]" cpuUsage_.percentUsageUser)]]"
tooltip-text="[[getCpuUsageTooltipText_()]]"> tooltip-text="[[getCpuUsageTooltipText_()]]"
class="data-point-margin-start">
</data-point> </data-point>
<div slot="body" class="divider"></div> <div slot="body" class="divider"></div>
<data-point slot="body" id="cpuTemp" header="[[i18n('cpuTempLabel')]]" <data-point slot="body" id="cpuTemp" header="[[i18n('cpuTempLabel')]]"
value="[[getCpuTemp_(cpuUsage_.averageCpuTempCelsius)]]"> value="[[getCpuTemp_(cpuUsage_.averageCpuTempCelsius)]]">
</data-point> </data-point>
<div slot="body" class="divider"></div> <div slot="body" class="divider"></div>
<data-point slot="body" id="cpuSpeed" header="[[i18n('cpuSpeedLabel')]]" <data-point slot="body" id="cpuSpeed" class="data-point-margin-end"
header="[[i18n('cpuSpeedLabel')]]"
value="[[getCpuSpeed_(cpuUsage_.scalingCurrentFrequencyKhz)]]"> value="[[getCpuSpeed_(cpuUsage_.scalingCurrentFrequencyKhz)]]">
</data-point> </data-point>
<routine-section slot="routines" routines="[[routines_]]" <routine-section slot="routines" routines="[[routines_]]"
......
...@@ -2,24 +2,27 @@ ...@@ -2,24 +2,27 @@
.data-point { .data-point {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 45px; height: 40px;
justify-content: space-between; justify-content: space-between;
margin: 12px 0;
} }
.header { .header {
@apply --diagnostics-data-point-title-font; @apply --diagnostics-data-point-title-font;
color: var(--diagnostics-overview-text-color); color: var(--diagnostics-data-point-title-color);
} }
#infoIcon { #infoIcon {
fill: var(--google-grey-600); bottom: 1px;
height: 18px; fill: var(--google-grey-700);
height: 20px;
left: 4px; left: 4px;
width: 18px; width: 20px;
} }
.value { .value {
@apply --diagnostics-data-point-subtitle-font; @apply --diagnostics-data-point-subtitle-font;
color: var(--diagnostics-data-point-subtitle-color);
} }
</style> </style>
<div class="data-point"> <div class="data-point">
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
.data-points { .data-points {
border-bottom: 1px solid var(--diagnostics-border-color); border-bottom: 1px solid var(--diagnostics-border-color);
display: grid; display: grid;
grid-template-columns: 1.5fr 0fr 1fr 0fr 1.5fr; grid-template-columns: 1fr 0fr 1fr 0fr 1fr;
padding-bottom: 8px; padding-inline: var(--data-point-container-padding);
} }
.icon { .icon {
......
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
:host { :host {
--diagnostics-default-font-family: "Google Sans", Roboto, sans-serif; --diagnostics-default-font-family: "Google Sans", Roboto, sans-serif;
--diagnostics-header-font-family: Roboto, sans-serif; --diagnostics-header-font-family: Roboto, sans-serif;
--diagnostics-data-point-font-family: Roboto, sans-serif;
--diagnostics-default-font-size: 14px; --diagnostics-default-font-size: 14px;
--diagnostics-header-font-size: 22px; --diagnostics-header-font-size: 22px;
--diagnostics-data-point-title-font-size: 12px; --diagnostics-data-point-title-font-size: 13px;
--diagnostics-data-point-subtitle-font-size: 15px; --diagnostics-data-point-subtitle-font-size: 13px;
--diagnostics-overview-font-size: 13px; --diagnostics-overview-font-size: 13px;
--diagnostics-chart-label-font-size: 15px; --diagnostics-chart-label-font-size: 15px;
--diagnostics-chart-tick-font-size: 12px; --diagnostics-chart-tick-font-size: 12px;
...@@ -15,13 +16,16 @@ ...@@ -15,13 +16,16 @@
--diagnostics-default-font-weight: 500; --diagnostics-default-font-weight: 500;
--diagnostics-header-font-weight: 600; --diagnostics-header-font-weight: 600;
--diagnostics-data-point-title-font-weight: 500; --diagnostics-data-point-title-font-weight: 400;
--diagnostics-data-point-subtitle-font-weight: 550; --diagnostics-data-point-subtitle-font-weight: 450;
--diagnostics-overview-font-weight: 500; --diagnostics-overview-font-weight: 500;
--diagnostics-default-text-color: var(--google-grey-900); --diagnostics-default-text-color: var(--google-grey-900);
--diagnostics-header-text-color: var(--google-grey-900); --diagnostics-header-text-color: var(--google-grey-900);
--diagnostics-overview-text-color: var(--google-grey-600); --diagnostics-overview-text-color: var(--google-grey-600);
--diagnostics-data-point-title-color: var(--google-grey-900);
--diagnostics-data-point-subtitle-color: var(--google-grey-700);
--diagnostics-default-font: { --diagnostics-default-font: {
font-family: var(--diagnostics-default-font-family); font-family: var(--diagnostics-default-font-family);
font-size: var(--diagnostics-default-font-size); font-size: var(--diagnostics-default-font-size);
...@@ -34,12 +38,12 @@ ...@@ -34,12 +38,12 @@
font-weight: var(--diagnostics-header-font-weight); font-weight: var(--diagnostics-header-font-weight);
} }
--diagnostics-data-point-title-font: { --diagnostics-data-point-title-font: {
font-family: var(--diagnostics-default-font-family); font-family: --diagnostics-data-point-font-family
font-size: var(--diagnostics-data-point-title-font-size); font-size: var(--diagnostics-data-point-title-font-size);
font-weight: var(--diagnostics-data-point-title-font-weight); font-weight: var(--diagnostics-data-point-title-font-weight);
}; };
--diagnostics-data-point-subtitle-font: { --diagnostics-data-point-subtitle-font: {
font-family: var(--diagnostics-default-font-family); font-family: --diagnostics-data-point-font-family
font-size: var(--diagnostics-data-point-subtitle-font-size); font-size: var(--diagnostics-data-point-subtitle-font-size);
font-weight: var(--diagnostics-data-point-subtitle-font-weight); font-weight: var(--diagnostics-data-point-subtitle-font-weight);
}; };
......
...@@ -13,12 +13,20 @@ ...@@ -13,12 +13,20 @@
background-color: var(--cros-bg-color); background-color: var(--cros-bg-color);
} }
.data-point-margin-end {
margin-right: 20px;
}
.data-point-margin-start {
margin-left: 20px;
}
.divider { .divider {
border-left: 1px solid var(--diagnostics-border-color); border-left: 1px solid var(--google-grey-200);
height: 36px; height: 32px;
padding-inline-start: 20px; padding-inline: 16px;
position: relative; position: relative;
top: 12%; top: 24%;
} }
@media (min-width:600px) { @media (min-width:600px) {
...@@ -26,6 +34,7 @@ ...@@ -26,6 +34,7 @@
--container-padding: 24px; --container-padding: 24px;
--content-container-width: 552px; --content-container-width: 552px;
--chart-width: 452px; --chart-width: 452px;
--data-point-container-padding: 44px;
} }
} }
...@@ -34,6 +43,7 @@ ...@@ -34,6 +43,7 @@
--container-padding: 64px; --container-padding: 64px;
--content-container-width: 640px; --content-container-width: 640px;
--chart-width: 540px; --chart-width: 540px;
--data-point-container-padding: 64px;
} }
} }
...@@ -42,6 +52,7 @@ ...@@ -42,6 +52,7 @@
--container-padding: 160px; --container-padding: 160px;
--content-container-width: 640px; --content-container-width: 640px;
--chart-width: 540px; --chart-width: 540px;
--data-point-container-padding: 64px;
} }
} }
...@@ -50,6 +61,7 @@ ...@@ -50,6 +61,7 @@
--container-padding: 160px; --container-padding: 160px;
--content-container-width: 680px; --content-container-width: 680px;
--chart-width: 580px; --chart-width: 580px;
--data-point-container-padding: 64px;
} }
} }
...@@ -58,6 +70,7 @@ ...@@ -58,6 +70,7 @@
--container-padding: 360px; --container-padding: 360px;
--content-container-width: 720px; --content-container-width: 720px;
--chart-width: 620px; --chart-width: 620px;
--data-point-container-padding: 64px;
} }
} }
</style> </style>
......
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