Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: chrome/browser/resources/chromeos/login/oobe_reset.html

Issue 2847603002: Powerwash UI polish (Closed)
Patch Set: Change according to new specs Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/chromeos/login/oobe_reset.html
diff --git a/chrome/browser/resources/chromeos/login/oobe_reset.html b/chrome/browser/resources/chromeos/login/oobe_reset.html
index 15a4107fb2e7fd6b603bd830002df9c3bd5bb74b..3afc401994b76670ff3fa5c4222de5500af24798 100644
--- a/chrome/browser/resources/chromeos/login/oobe_reset.html
+++ b/chrome/browser/resources/chromeos/login/oobe_reset.html
@@ -2,6 +2,30 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
+
+<iron-iconset-svg name="oobe-reset-32" size="32">
+ <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>
+ </g>
+ </defs>
+ </svg>
+</iron-iconset-svg>
+
+<iron-iconset-svg name="oobe-reset-64" size="64">
+ <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>
+ </g>
+ </defs>
+ </svg>
+</iron-iconset-svg>
+
<dom-module id="oobe-reset-md">
<template>
<link rel="stylesheet" href="oobe_reset.css">
@@ -9,10 +33,12 @@
<link rel="stylesheet" href="chrome://resources/css/throbber.css">
<oobe-dialog id="resetDialog" role="dialog"
i18n-values="aria-label:resetScreenAccessibleTitle" has-buttons>
- <iron-icon icon="icons:info" class="oobe-icon"></iron-icon>
+ <hd-iron-icon class="oobe-icon"
+ icon1x="oobe-reset-32:alert" icon2x="oobe-reset-64:alert">
+ </hd-iron-icon>
<div class="header">
<h1 class="title" i18n-content="resetWarningTitle"></h1>
- <div class="subtitle">
+ <div class="subtitle powerwash-warning">
<div hidden="[[!isState_(uiState_, 'powerwash-proposal-view')]]"
i18n-content="resetPowerwashWarningDetails"></div>
<div hidden="[[!isState_(uiState_, 'powerwash-proposal-view')]]"
@@ -35,14 +61,14 @@
</div>
</div>
</div>
- <div class="footer layout vertical">
+ <div class="footer flex layout vertical center">
<img srcset="images/reset_illustration_1x.png 1x,
images/reset_illustration_2x.png 2x"
i18n-values="alt:resetScreenIllustrationTitle">
</div>
<div class="bottom-buttons flex layout horizontal">
<div class="flex"></div>
- <oobe-text-button border on-tap="onCancelTap_"
+ <oobe-text-button id="cancelButton" border on-tap="onCancelTap_"
hidden="[[isCancelHidden_(uiState_)]]">
<div i18n-content="cancelButton"></div>
</oobe-text-button>

Powered by Google App Engine
This is Rietveld 408576698