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

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

Issue 2254733004: ChromeOS: Update styles of material design OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing files. Created 4 years, 4 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_welcome.html
diff --git a/chrome/browser/resources/chromeos/login/oobe_welcome.html b/chrome/browser/resources/chromeos/login/oobe_welcome.html
index 0ab78e1991f8124ae4e2a0bc5904e324477d023e..4ab2b5ed476be3228bcb642f4b24082e8503869e 100644
--- a/chrome/browser/resources/chromeos/login/oobe_welcome.html
+++ b/chrome/browser/resources/chromeos/login/oobe_welcome.html
@@ -19,14 +19,16 @@
</iron-iconset-svg>
<dom-module name="oobe-welcome-md">
+ <link rel="stylesheet" href="oobe_dialog_host.css" is="custom-style">
michaelpg 2016/08/18 19:40:59 AFAIK is="custom-style" has no meaning for <link r
Alexander Alekseev 2016/08/19 06:00:06 Done.
<link rel="stylesheet" href="oobe_welcome.css">
+ <link rel="stylesheet" href="oobe_dialog_arguments.css">
<template>
<oobe-card id="welcomeSection" hidden="[[!welcomeScreenShown]]">
<div class="header flex vertical layout end-justified start">
<h1 class="welcome-message" i18n-content="networkScreenGreeting"></h1>
</div>
<div class="footer flex vertical layout justified">
- <div class="welcome-next flex vertical layout center">
+ <div class="welcome-next flex layout vertical center">
<oobe-next-button id="welcomeNextButton"
on-tap="onWelcomeNextButtonClicked_">
</oobe-next-button>
@@ -51,14 +53,14 @@
<oobe-dialog hidden="[[!languageSelectionScreenShown]]"
has-buttons>
<iron-icon icon="icons:language" class="oobe-icon"></iron-icon>
- <div class="header flex layout vertical end-justified start">
- <h1 class="welcome-message" i18n-content="languageSectionTitle"></h1>
+ <div class="header">
+ <h1 class="title" i18n-content="languageSectionTitle"></h1>
</div>
<div class="footer layout vertical">
<template is="dom-if" if="[[enabled]]">
<div id="languageDropdownContainer"
class="flex layout horizontal justified language-selection-entry">
- <div class="layout vertical center-justified"
+ <div class="language-selection-title layout vertical center-justified"
i18n-content="languageDropdownTitle">
</div>
<oobe-i18n-dropdown id="languageSelect" items="[[languages]]"
@@ -68,7 +70,7 @@
</div>
<div id="keyboardDropdownContainer"
class="flex layout horizontal justified language-selection-entry">
- <div class="layout vertical center-justified"
+ <div class="language-selection-title layout vertical center-justified"
i18n-content="keyboardDropdownTitle">
</div>
<oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]"
@@ -79,6 +81,7 @@
</template>
</div>
<div class="bottom-buttons layout horizontal">
+ <div class="flex"><!-- spacer to align button to the right --></div>
michaelpg 2016/08/18 19:40:59 same: use end-justified on .bottom-buttons instead
Alexander Alekseev 2016/08/19 06:00:06 Done.
<oobe-text-button inverse on-tap="closeLanguageSection_"
i18n-content="oobeOKButtonText">
</oobe-text-button>
@@ -87,12 +90,12 @@
<oobe-dialog hidden="[[!accessibilityOptionsScreenShown]]"
has-buttons>
<iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon>
- <div class="header flex layout vertical end-justified start">
- <h1 class="welcome-message" i18n-content="accessibilitySectionTitle">
+ <div class="header">
+ <h1 class="title" i18n-content="accessibilitySectionTitle">
</h1>
- <h1 class="welcome-message-hint"
+ <div class="subtitle"
i18n-content="accessibilitySectionHint">
michaelpg 2016/08/18 19:40:59 unwrap
Alexander Alekseev 2016/08/19 06:00:06 Done.
- </h1>
+ </div>
</div>
<div class="footer layout vertical">
<oobe-a11y-option checked="[[a11yStatus.spokenFeedbackEnabled]]"
@@ -142,6 +145,7 @@
</oobe-a11y-option>
</div>
<div class="bottom-buttons layout horizontal">
+ <div class="flex"><!-- spacer to align button to the right --></div>
michaelpg 2016/08/18 19:40:59 (same. throughout)
Alexander Alekseev 2016/08/19 06:00:06 Done.
<oobe-text-button inverse on-tap="closeAccessibilitySection_"
i18n-content="oobeOKButtonText">
</oobe-text-button>
@@ -150,17 +154,17 @@
<oobe-dialog id="networkSection"
hidden="[[!networkSelectionScreenShown]]">
<iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon>
- <div class="header flex layout vertical end-justified start">
- <h1 class="welcome-message" i18n-content="networkSectionTitle"></h1>
- <h1 class="welcome-message-hint" i18n-content="networkSectionHint"></h1>
+ <div class="header">
+ <h1 class="title" i18n-content="networkSectionTitle"></h1>
+ <div class="subtitle" i18n-content="networkSectionHint"></div>
</div>
- <div class="footer flex layout vertical justified">
+ <div class="footer layout vertical">
<cr-network-select id="networkSelect"
on-network-connected="onNetworkConnected_"
on-network-item-selected="onNetworkListNetworkItemSelected_"
on-custom-item-selected="onNetworkListCustomItemSelected_"
custom-items="[[_getNetworkCustomItems()]]"
- max-height="280">
+ max-height="385">
</cr-network-select>
</div>
</oobe-dialog>

Powered by Google App Engine
This is Rietveld 408576698