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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2753513002: ChromeOS OOBE: display icons specific to screen DPI. (Closed)
Patch Set: Added hr-iron-icon Created 3 years, 9 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
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_eula.html ('k') | chrome/browser/resources/chromeos/login/oobe_welcome_dialog.html » ('j') | chrome/browser/resources/chromeos/login/oobe_welcome_dialog.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/login/oobe_welcome.html
diff --git a/chrome/browser/resources/chromeos/login/oobe_welcome.html b/chrome/browser/resources/chromeos/login/oobe_welcome.html
index e905a5bff8f9ccbe620bbda306dc53840cbc9f56..da366973dbca3bfc5b0d63454dbcb968bca6551b 100644
--- a/chrome/browser/resources/chromeos/login/oobe_welcome.html
+++ b/chrome/browser/resources/chromeos/login/oobe_welcome.html
@@ -9,14 +9,6 @@
<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-welcome" size="24">
- <svg>
- <defs>
- <g id="wifi"><path d="M1 9l2 2c4.97-4.97 13.03-4.97 18 0l2-2C16.93 2.93 7.08 2.93 1 9zm8 8l3 3 3-3c-1.65-1.66-4.34-1.66-6 0zm-4-4l2 2c2.76-2.76 7.24-2.76 10 0l2-2C15.14 9.14 8.87 9.14 5 13z"></path></g>
- </defs>
- </svg>
-</iron-iconset-svg>
-
<iron-iconset-svg name="oobe-welcome-20" size="20">
<svg>
<defs>
@@ -40,13 +32,46 @@
</defs>
</svg>
</iron-iconset-svg>
+
+<iron-iconset-svg name="oobe-welcome-32" size="32">
+ <svg>
+ <defs>
+ <g id="accessibility" fill-rule="evenodd">
+ <path d="M16 2.667c1.467 0 2.667 1.184 2.667 2.633 0 1.448-1.2 2.632-2.667 2.632-1.467 0-2.667-1.184-2.667-2.632 0-1.45 1.2-2.633 2.667-2.633zm4 9.215v16.785h-3v-7.9h-2v7.9h-3V11.882H4V8.92h24v2.962h-8z"></path>
+ </g>
+ <g id="language" fill-rule="evenodd">
+ <path d="M15.987 2.667C8.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.667zm9.24 8h-3.934C20.867 9 20.253 7.4 19.453 5.92c2.454.84 4.494 2.547 5.774 4.747zM16 5.387c1.107 1.6 1.973 3.373 2.547 5.28h-5.094c.574-1.907 1.44-3.68 2.547-5.28zM5.68 18.667c-.213-.854-.347-1.747-.347-2.667 0-.92.134-1.813.347-2.667h4.507C10.08 14.213 10 15.093 10 16c0 .907.08 1.787.187 2.667H5.68zm1.093 2.666h3.934c.426 1.667 1.04 3.267 1.84 4.747-2.454-.84-4.494-2.533-5.774-4.747zm3.934-10.666H6.773c1.28-2.214 3.32-3.907 5.774-4.747-.8 1.48-1.414 3.08-1.84 4.747zM16 26.613c-1.107-1.6-1.973-3.373-2.547-5.28h5.094c-.574 1.907-1.44 3.68-2.547 5.28zm3.12-7.946h-6.24c-.12-.88-.213-1.76-.213-2.667 0-.907.093-1.8.213-2.667h6.24c.12.867.213 1.76.213 2.667 0 .907-.093 1.787-.213 2.667zm.333 7.413c.8-1.48 1.414-3.08 1.84-4.747h3.934c-1.28 2.2-3.32 3.907-5.774 4.747zm2.36-7.413c.107-.88.187-1.76.187-2.667 0-.907-.08-1.787-.187-2.667h4.507c.213.854.347 1.747.347 2.667 0 .92-.134 1.813-.347 2.667h-4.507z"></path>
+ </g>
+ <g id="timezone" fill-rule="evenodd">
+ <path d="M15.993 2.667C8.627 2.667 2.667 8.633 2.667 16s5.96 13.333 13.326 13.333c7.367 0 13.34-5.966 13.34-13.333S23.36 2.667 15.993 2.667zm.007 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>
+ <path d="M16.667 9.333h-2v8l6.993 4.2 1.007-1.64-6-3.56"></path>
+ </g>
+ <g id="wifi" fill-rule="evenodd">
+ <path d="M1.333 12L4 14.667c6.627-6.627 17.373-6.627 24 0L30.667 12c-8.1-8.1-21.234-8.1-29.334 0zM12 22.667l4 4 4-4c-2.207-2.207-5.793-2.207-8 0zm-5.333-5.334L9.333 20c3.68-3.68 9.654-3.68 13.334 0l2.666-2.667c-5.153-5.153-13.513-5.153-18.666 0z"></path>
+ </g>
+
+ </defs>
+ </svg>
+</iron-iconset-svg>
+
<iron-iconset-svg name="oobe-welcome-64" size="64">
<svg>
<defs>
- <g id="timezone" fill="none" fill-rule="evenodd">
- <path d="M0 0h64v64H0"></path>
- <path d="M31.987 5.333C17.253 5.333 5.333 17.267 5.333 32c0 14.733 11.92 26.667 26.654 26.667 14.733 0 26.68-11.934 26.68-26.667 0-14.733-11.947-26.667-26.68-26.667zm.013 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" fill="#5A5A5A"></path>
- <path fill="#5A5A5A" d="M33.333 18.667h-4v16l13.987 8.4 2.013-3.28-12-7.12"></path>
+ <g id="accessibility" fill-rule="evenodd">
+ <path d="M32 5.333c2.933 0 5.333 2.415 5.333 5.367 0 2.95-2.4 5.366-5.333 5.366-2.933 0-5.333-2.415-5.333-5.366 0-2.952 2.4-5.367 5.333-5.367zM40 24v35h-5V43h-6v16.006h-5V24H8v-4.915h48V24H40z"></path>
+ </g>
+ <g id="language" fill-rule="evenodd">
+ <text font-family="RobotoMono-Regular, Roboto Mono" font-size="20" transform="translate(0 -71)">
+ <tspan x="1" y="19">Language</tspan>
+ </text>
+ <path d="M31.973 5.333C17.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.667zm18.48 16h-7.866c-.854-3.333-2.08-6.533-3.68-9.493 4.906 1.68 8.986 5.093 11.546 9.493zM32 10.773c2.213 3.2 3.947 6.747 5.093 10.56H26.907c1.146-3.813 2.88-7.36 5.093-10.56zm-20.64 26.56c-.427-1.706-.693-3.493-.693-5.333 0-1.84.266-3.627.693-5.333h9.013C20.16 28.427 20 30.187 20 32c0 1.813.16 3.573.373 5.333H11.36zm2.187 5.334h7.866c.854 3.333 2.08 6.533 3.68 9.493-4.906-1.68-8.986-5.067-11.546-9.493zm7.866-21.334h-7.866c2.56-4.426 6.64-7.813 11.546-9.493-1.6 2.96-2.826 6.16-3.68 9.493zM32 53.227c-2.213-3.2-3.947-6.747-5.093-10.56h10.186c-1.146 3.813-2.88 7.36-5.093 10.56zm6.24-15.894H25.76c-.24-1.76-.427-3.52-.427-5.333 0-1.813.187-3.6.427-5.333h12.48c.24 1.733.427 3.52.427 5.333 0 1.813-.187 3.573-.427 5.333zm.667 14.827c1.6-2.96 2.826-6.16 3.68-9.493h7.866c-2.56 4.4-6.64 7.813-11.546 9.493zm4.72-14.827c.213-1.76.373-3.52.373-5.333 0-1.813-.16-3.573-.373-5.333h9.013c.427 1.706.693 3.493.693 5.333 0 1.84-.266 3.627-.693 5.333h-9.013z"></path>
+ </g>
+ <g id="timezone" fill-rule="evenodd">
+ <path d="M31.987 5.333C17.253 5.333 5.333 17.267 5.333 32c0 14.733 11.92 26.667 26.654 26.667 14.733 0 26.68-11.934 26.68-26.667 0-14.733-11.947-26.667-26.68-26.667zm.013 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>
+ <path d="M33.333 18.667h-4v16l13.987 8.4 2.013-3.28-12-7.12"></path>
+ </g>
+ <g id="wifi" fill-rule="evenodd">
+ <path d="M2.667 24L8 29.333c13.253-13.253 34.747-13.253 48 0L61.333 24C45.133 7.8 18.867 7.8 2.667 24zM24 45.333l8 8 8-8c-4.413-4.413-11.587-4.413-16 0zM13.333 34.667L18.667 40c7.36-7.36 19.306-7.36 26.666 0l5.334-5.333c-10.307-10.307-27.027-10.307-37.334 0z"></path>
</g>
</defs>
</svg>
@@ -70,7 +95,9 @@
</oobe-welcome-dialog>
<oobe-dialog id="languageScreen" role="dialog" hidden has-buttons
i18n-values="aria-label:languageSectionTitle">
- <iron-icon icon="icons:language" class="oobe-icon"></iron-icon>
+ <hd-iron-icon class="oobe-icon"
+ icon1x="oobe-welcome-32:language" icon2x="oobe-welcome-64:language">
+ </hd-iron-icon>
<div class="header">
<h1 class="title" i18n-content="languageSectionTitle"></h1>
</div>
@@ -107,7 +134,10 @@
</oobe-dialog>
<oobe-dialog id="accessibilityScreen" role="dialog" hidden has-buttons
i18n-values="aria-label:accessibilitySectionTitle">
- <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon>
+ <hd-iron-icon class="oobe-icon"
+ icon1x="oobe-welcome-32:accessibility"
+ icon2x="oobe-welcome-64:accessibility">
+ </hd-iron-icon>
<div class="header">
<h1 class="title" i18n-content="accessibilitySectionTitle"></h1>
<div class="subtitle" i18n-content="accessibilitySectionHint"></div>
@@ -173,7 +203,9 @@
</oobe-dialog>
<oobe-dialog id="timezoneScreen" role="dialog" hidden has-buttons
i18n-values="aria-label:timezoneSectionTitle">
- <iron-icon icon="oobe-welcome-64:timezone" class="oobe-icon"></iron-icon>
+ <hd-iron-icon class="oobe-icon"
+ icon1x="oobe-welcome-32:timezone" icon2x="oobe-welcome-64:timezone">
+ </hd-iron-icon>
<div class="header">
<h1 class="title" i18n-content="timezoneSectionTitle"></h1>
</div>
@@ -198,7 +230,9 @@
<oobe-dialog id="networkSelectionScreen" role="dialog" hidden has-buttons
i18n-values="aria-label:networkSectionTitle"
on-show-dialog="onNetworkSelectionScreenShown_">
- <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon>
+ <hd-iron-icon class="oobe-icon"
+ icon1x="oobe-welcome-32:wifi" icon2x="oobe-welcome-64:wifi">
+ </hd-iron-icon>
<div class="header">
<h1 class="title" i18n-content="networkSectionTitle"></h1>
<div class="subtitle" i18n-content="networkSectionHint"></div>
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_eula.html ('k') | chrome/browser/resources/chromeos/login/oobe_welcome_dialog.html » ('j') | chrome/browser/resources/chromeos/login/oobe_welcome_dialog.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698