Skip to content

Commit

Permalink
Chrome OS Powerwash screen: update icon and illustration.
Browse files Browse the repository at this point in the history
[email protected]

(cherry picked from commit afc97ac)

Bug: 894280
Change-Id: I0d478790d35323008a0622404ebde6983fea06ae
Reviewed-on: https://chromium-review.googlesource.com/c/1278211
Commit-Queue: Alexander Alekseev <[email protected]>
Reviewed-by: Wenzhao (Colin) Zang <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#599141}
Reviewed-on: https://chromium-review.googlesource.com/c/1287509
Reviewed-by: Alexander Alekseev <[email protected]>
Cr-Commit-Position: refs/branch-heads/3578@{#109}
Cr-Branched-From: 4226ddf-refs/heads/master@{#599034}
  • Loading branch information
Alexander Alekseev committed Oct 18, 2018
1 parent 3252a5c commit f74a6a1
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 4 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions chrome/browser/resources/chromeos/login/oobe_reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,8 @@ a {
cursor: pointer;
pointer-events: auto;
}

#illustration {
height: 264px;
width: 264px;
}
20 changes: 16 additions & 4 deletions chrome/browser/resources/chromeos/login/oobe_reset.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@
<svg>
<defs>
<g id="alert" fill-rule="evenodd">
<path d="M16,2.66666667 C8.64,2.66666667 2.66666667,8.64 2.66666667,16 C2.66666667,23.36 8.64,29.3333333 16,29.3333333 C23.36,29.3333333 29.3333333,23.36 29.3333333,16 C29.3333333,8.64 23.36,2.66666667 16,2.66666667 L16,2.66666667 Z M17.3333333,22.6666667 L14.6666667,22.6666667 L14.6666667,20 L17.3333333,20 L17.3333333,22.6666667 L17.3333333,22.6666667 Z M17.3333333,17.3333333 L14.6666667,17.3333333 L14.6666667,9.33333333 L17.3333333,9.33333333 L17.3333333,17.3333333 L17.3333333,17.3333333 Z"></path>
<defs>
<path id="a" d="M14.667 20h2.666v2.667h-2.666V20zm0-10.667h2.666v8h-2.666v-8zm1.32-6.666C8.627 2.667 2.667 8.64 2.667 16s5.96 13.333 13.32 13.333c7.373 0 13.346-5.973 13.346-13.333S23.36 2.667 15.987 2.667zm.013 24c-5.893 0-10.667-4.774-10.667-10.667S10.107 5.333 16 5.333 26.667 10.107 26.667 16 21.893 26.667 16 26.667z"></path>
</defs>
<g fill="none" fill-rule="evenodd">
<path d="M0 0h32v32H0z"></path>
<use fill="#1A73E8" fill-rule="nonzero" xlink:href="#a"></use>
</g>
</g>
</defs>
</svg>
Expand All @@ -20,7 +26,13 @@
<svg>
<defs>
<g id="alert" fill-rule="evenodd">
<path d="M32,5.33333333 C17.28,5.33333333 5.33333333,17.28 5.33333333,32 C5.33333333,46.72 17.28,58.6666667 32,58.6666667 C46.72,58.6666667 58.6666667,46.72 58.6666667,32 C58.6666667,17.28 46.72,5.33333333 32,5.33333333 L32,5.33333333 Z M34.6666667,45.3333333 L29.3333333,45.3333333 L29.3333333,40 L34.6666667,40 L34.6666667,45.3333333 L34.6666667,45.3333333 Z M34.6666667,34.6666667 L29.3333333,34.6666667 L29.3333333,18.6666667 L34.6666667,18.6666667 L34.6666667,34.6666667 L34.6666667,34.6666667 Z"></path>
<defs>
<path id="a" d="M29.333 40h5.334v5.333h-5.334V40zm0-21.333h5.334v16h-5.334v-16zm2.64-13.334C17.253 5.333 5.333 17.28 5.333 32c0 14.72 11.92 26.667 26.64 26.667C46.72 58.667 58.667 46.72 58.667 32c0-14.72-11.947-26.667-26.694-26.667zm.027 48c-11.787 0-21.333-9.546-21.333-21.333 0-11.787 9.546-21.333 21.333-21.333 11.787 0 21.333 9.546 21.333 21.333 0 11.787-9.546 21.333-21.333 21.333z"></path>
</defs>
<g fill="none" fill-rule="evenodd">
<path d="M0 0h64v64H0z"></path>
<use fill="#1A73E8" fill-rule="nonzero" xlink:href="#a"></use>
</g>
</g>
</defs>
</svg>
Expand Down Expand Up @@ -60,8 +72,8 @@ <h1 slot="title" i18n-content="resetWarningTitle"></h1>
</div>
</div>
<div slot="footer" class="flex layout vertical center">
<img srcset="images/reset_illustration_1x.png 1x,
images/reset_illustration_2x.png 2x"
<img id="illustration" srcset="images/1x/reset_illustration_1x.svg 1x,
images/2x/reset_illustration_2x.svg 2x"
i18n-values="alt:resetScreenIllustrationTitle">
<div id="tpmFirmwareUpdate" class="layout horizontal"
hidden="[[!tpmFirmwareUpdateAvailable_]]">
Expand Down

0 comments on commit f74a6a1

Please sign in to comment.