Commit 108c1307 authored by Alexander Alekseev's avatar Alexander Alekseev Committed by Commit Bot

Chrome OS OOBE: Update HID detection screen style.

This CL updates HID detection screen with new style.

Bug: 852046
Change-Id: Ibba68ae848efeb7518ec1942719da666f5f92f24
Reviewed-on: https://chromium-review.googlesource.com/1150970Reviewed-by: default avatarWenzhao (Colin) Zang <wzang@chromium.org>
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578470}
parent 316153bf
...@@ -2,15 +2,34 @@ ...@@ -2,15 +2,34 @@
* Use of this source code is governed by a BSD-style license that can be * Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */ * found in the LICENSE file. */
#continue-button-text { :root {
text-transform: none; --oobe-hid-detection-item-border: 1px solid var(--google-grey-200);
}
#status-container {
margin: 15px 0;
}
.hid-selection-entry:first-of-type {
margin-top: 8px;
}
.hid-selection-entry {
border-top: var(--oobe-hid-detection-item-border);
color: var(--google-grey-900);
font-size: 13px;
min-height: 48px;
}
.hid-selection-entry:last-of-type {
border-bottom: var(--oobe-hid-detection-item-border);
} }
#keyboard-icon, #keyboard-icon,
#mouse-icon { #mouse-icon {
--iron-icon-height: 32px; --iron-icon-height: 20px;
--iron-icon-width: 32px; --iron-icon-width: 20px;
padding-right: 8px; padding-inline-end: 8px;
} }
#keyboard-tick, #keyboard-tick,
...@@ -21,23 +40,44 @@ ...@@ -21,23 +40,44 @@
} }
#hid-keyboard-pincode { #hid-keyboard-pincode {
padding-bottom: 4px; padding 15px 0;
}; };
#hid-continue-button { .bluetooth-keyboard-button {
padding-inline-end: 18px; border: 1px solid #ccc;
border-radius: 4px;
box-shadow: 0 0 0 1px #222;
color: #222;
display: inline-block;
font-size: 16px;
height: 38px;
line-height: 38px;
margin: 0 5px;
padding: 0 15px;
position: relative;
text-align: center;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
vertical-align: baseline;
} }
[slot='bottom-buttons'] { #bluetooth-enter-key {
padding: 0 6px; /* = 8px - 2px back button border */ min-width: 54px;
} }
.hid-selection-entry { .key-typed {
border-top: 1px solid lightgrey; color: #222;
min-height: 44px;
padding: 0 20px;
} }
.hid-selection-entry:last-of-type { .key-next {
border-bottom: 1px solid lightgrey; background: rgb(77, 144, 254);
background-image: none;
border: 2px solid rgb(77, 144, 254);
box-shadow: none;
color: #fff;
}
.key-untyped {
border: 1px solid #d4d4d4;
box-shadow: 0 0 0 1px #888;
color: #666;
} }
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
</div> </div>
</div> </div>
<div class="layout vertical hid-selection-entry"> <div class="layout vertical hid-selection-entry">
<div class="flex layout horizontal center"> <div id="status-container" class="flex layout horizontal center">
<hd-iron-icon id="keyboard-icon" alt="" <hd-iron-icon id="keyboard-icon" alt=""
icon1x="oobe-hid-detection-20:keyboard" icon1x="oobe-hid-detection-20:keyboard"
icon2x="oobe-hid-detection-40:keyboard"> icon2x="oobe-hid-detection-40:keyboard">
...@@ -138,10 +138,9 @@ ...@@ -138,10 +138,9 @@
</div> </div>
</div> </div>
<div slot="bottom-buttons" class="flex layout horizontal end-justified"> <div slot="bottom-buttons" class="flex layout horizontal end-justified">
<oobe-text-button id="hid-continue-button" <oobe-text-button inverse on-tap="onHIDContinueTap_"
inverse on-tap="onHIDContinueTap_"
disabled="[[continueButtonDisabled]]"> disabled="[[continueButtonDisabled]]">
<div i18n-content="hidDetectionContinue" id="continue-button-text"> <div i18n-content="hidDetectionContinue">
</div> </div>
</oobe-text-button> </oobe-text-button>
</div> </div>
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
Polymer({ Polymer({
is: 'oobe-hid-detection-md', is: 'oobe-hid-detection-md',
behaviors: [I18nBehavior, OobeDialogHostBehavior],
properties: { properties: {
/** "Continue" button is disabled until HID devices are paired. */ /** "Continue" button is disabled until HID devices are paired. */
continueButtonDisabled: { continueButtonDisabled: {
......
<div class="step hidden" id="hid-detection" hidden role="group" <div class="step hidden" id="hid-detection" hidden role="group"
i18n-values="aria-label:hidDetectionInvitation"> i18n-values="aria-label:hidDetectionInvitation">
<oobe-hid-detection-md id="oobe-hid-detection-md"> <oobe-hid-detection-md id="oobe-hid-detection-md" full-screen-dialog>
</oobe-hid-detection-md> </oobe-hid-detection-md>
</div> </div>
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