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

Side by Side 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 unified diff | Download patch
OLDNEW
1 <!-- Copyright 2016 The Chromium Authors. All rights reserved. 1 <!-- Copyright 2016 The Chromium Authors. All rights reserved.
2 Use of this source code is governed by a BSD-style license that can be 2 Use of this source code is governed by a BSD-style license that can be
3 found in the LICENSE file. --> 3 found in the LICENSE file. -->
4 4
5 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html"> 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html">
6 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_selec t.html"> 6 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_selec t.html">
7 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 7 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i conset-svg.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i conset-svg.html">
11 11
12 <iron-iconset-svg name="oobe-welcome" size="24"> 12 <iron-iconset-svg name="oobe-welcome" size="24">
13 <svg> 13 <svg>
14 <defs> 14 <defs>
15 <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path></g> 15 <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path></g>
16 <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> 16 <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>
17 </defs> 17 </defs>
18 </svg> 18 </svg>
19 </iron-iconset-svg> 19 </iron-iconset-svg>
20 20
21 <dom-module name="oobe-welcome-md"> 21 <dom-module name="oobe-welcome-md">
22 <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.
22 <link rel="stylesheet" href="oobe_welcome.css"> 23 <link rel="stylesheet" href="oobe_welcome.css">
24 <link rel="stylesheet" href="oobe_dialog_arguments.css">
23 <template> 25 <template>
24 <oobe-card id="welcomeSection" hidden="[[!welcomeScreenShown]]"> 26 <oobe-card id="welcomeSection" hidden="[[!welcomeScreenShown]]">
25 <div class="header flex vertical layout end-justified start"> 27 <div class="header flex vertical layout end-justified start">
26 <h1 class="welcome-message" i18n-content="networkScreenGreeting"></h1> 28 <h1 class="welcome-message" i18n-content="networkScreenGreeting"></h1>
27 </div> 29 </div>
28 <div class="footer flex vertical layout justified"> 30 <div class="footer flex vertical layout justified">
29 <div class="welcome-next flex vertical layout center"> 31 <div class="welcome-next flex layout vertical center">
30 <oobe-next-button id="welcomeNextButton" 32 <oobe-next-button id="welcomeNextButton"
31 on-tap="onWelcomeNextButtonClicked_"> 33 on-tap="onWelcomeNextButtonClicked_">
32 </oobe-next-button> 34 </oobe-next-button>
33 </div> 35 </div>
34 <div class="flex horizontal layout justified"> 36 <div class="flex horizontal layout justified">
35 <div class="buttonbox layout vertical" 37 <div class="buttonbox layout vertical"
36 on-tap="onWelcomeSelectLanguageButtonClicked_"> 38 on-tap="onWelcomeSelectLanguageButtonClicked_">
37 <iron-icon icon="icons:language" class="bottom-button self-center"> 39 <iron-icon icon="icons:language" class="bottom-button self-center">
38 </iron-icon> 40 </iron-icon>
39 <div id="currentLanguage">[[currentLanguage]]</div> 41 <div id="currentLanguage">[[currentLanguage]]</div>
40 </div> 42 </div>
41 <div class="buttonbox layout vertical" 43 <div class="buttonbox layout vertical"
42 on-tap="onWelcomeAccessibilityButtonClicked_"> 44 on-tap="onWelcomeAccessibilityButtonClicked_">
43 <iron-icon icon="icons:accessibility" 45 <iron-icon icon="icons:accessibility"
44 class="bottom-button self-center"> 46 class="bottom-button self-center">
45 </iron-icon> 47 </iron-icon>
46 <div id="accessibilityLabel" i18n-content="accessibilityLink"></div> 48 <div id="accessibilityLabel" i18n-content="accessibilityLink"></div>
47 </div> 49 </div>
48 </div> 50 </div>
49 </div> 51 </div>
50 </oobe-card> 52 </oobe-card>
51 <oobe-dialog hidden="[[!languageSelectionScreenShown]]" 53 <oobe-dialog hidden="[[!languageSelectionScreenShown]]"
52 has-buttons> 54 has-buttons>
53 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon> 55 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon>
54 <div class="header flex layout vertical end-justified start"> 56 <div class="header">
55 <h1 class="welcome-message" i18n-content="languageSectionTitle"></h1> 57 <h1 class="title" i18n-content="languageSectionTitle"></h1>
56 </div> 58 </div>
57 <div class="footer layout vertical"> 59 <div class="footer layout vertical">
58 <template is="dom-if" if="[[enabled]]"> 60 <template is="dom-if" if="[[enabled]]">
59 <div id="languageDropdownContainer" 61 <div id="languageDropdownContainer"
60 class="flex layout horizontal justified language-selection-entry"> 62 class="flex layout horizontal justified language-selection-entry">
61 <div class="layout vertical center-justified" 63 <div class="language-selection-title layout vertical center-justifie d"
62 i18n-content="languageDropdownTitle"> 64 i18n-content="languageDropdownTitle">
63 </div> 65 </div>
64 <oobe-i18n-dropdown id="languageSelect" items="[[languages]]" 66 <oobe-i18n-dropdown id="languageSelect" items="[[languages]]"
65 on-select-item="onLanguageSelected_" 67 on-select-item="onLanguageSelected_"
66 label="$i18n{languageDropdownTitle}"> 68 label="$i18n{languageDropdownTitle}">
67 </oobe-i18n-dropdown> 69 </oobe-i18n-dropdown>
68 </div> 70 </div>
69 <div id="keyboardDropdownContainer" 71 <div id="keyboardDropdownContainer"
70 class="flex layout horizontal justified language-selection-entry"> 72 class="flex layout horizontal justified language-selection-entry">
71 <div class="layout vertical center-justified" 73 <div class="language-selection-title layout vertical center-justifie d"
72 i18n-content="keyboardDropdownTitle"> 74 i18n-content="keyboardDropdownTitle">
73 </div> 75 </div>
74 <oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]" 76 <oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]"
75 on-select-item="onKeyboardSelected_" 77 on-select-item="onKeyboardSelected_"
76 label="$i18n{keyboardDropdownTitle}"> 78 label="$i18n{keyboardDropdownTitle}">
77 </oobe-i18n-dropdown> 79 </oobe-i18n-dropdown>
78 </div> 80 </div>
79 </template> 81 </template>
80 </div> 82 </div>
81 <div class="bottom-buttons layout horizontal"> 83 <div class="bottom-buttons layout horizontal">
84 <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.
82 <oobe-text-button inverse on-tap="closeLanguageSection_" 85 <oobe-text-button inverse on-tap="closeLanguageSection_"
83 i18n-content="oobeOKButtonText"> 86 i18n-content="oobeOKButtonText">
84 </oobe-text-button> 87 </oobe-text-button>
85 </div> 88 </div>
86 </oobe-dialog> 89 </oobe-dialog>
87 <oobe-dialog hidden="[[!accessibilityOptionsScreenShown]]" 90 <oobe-dialog hidden="[[!accessibilityOptionsScreenShown]]"
88 has-buttons> 91 has-buttons>
89 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon> 92 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon>
90 <div class="header flex layout vertical end-justified start"> 93 <div class="header">
91 <h1 class="welcome-message" i18n-content="accessibilitySectionTitle"> 94 <h1 class="title" i18n-content="accessibilitySectionTitle">
92 </h1> 95 </h1>
93 <h1 class="welcome-message-hint" 96 <div class="subtitle"
94 i18n-content="accessibilitySectionHint"> 97 i18n-content="accessibilitySectionHint">
michaelpg 2016/08/18 19:40:59 unwrap
Alexander Alekseev 2016/08/19 06:00:06 Done.
95 </h1> 98 </div>
96 </div> 99 </div>
97 <div class="footer layout vertical"> 100 <div class="footer layout vertical">
98 <oobe-a11y-option checked="[[a11yStatus.spokenFeedbackEnabled]]" 101 <oobe-a11y-option checked="[[a11yStatus.spokenFeedbackEnabled]]"
99 on-change="onA11yOptionChanged_" 102 on-change="onA11yOptionChanged_"
100 chrome-message="enableSpokenFeedback"> 103 chrome-message="enableSpokenFeedback">
101 <span class="title" i18n-content="spokenFeedbackOption"></span> 104 <span class="title" i18n-content="spokenFeedbackOption"></span>
102 <span class="checked-value" i18n-content="spokenFeedbackOptionOn"> 105 <span class="checked-value" i18n-content="spokenFeedbackOptionOn">
103 </span> 106 </span>
104 <span class="unchecked-value" i18n-content="spokenFeedbackOptionOff"> 107 <span class="unchecked-value" i18n-content="spokenFeedbackOptionOff">
105 </span> 108 </span>
(...skipping 29 matching lines...) Expand all
135 on-change="onA11yOptionChanged_" 138 on-change="onA11yOptionChanged_"
136 chrome-message="enableVirtualKeyboard"> 139 chrome-message="enableVirtualKeyboard">
137 <span class="title" i18n-content="virtualKeyboardOption"></span> 140 <span class="title" i18n-content="virtualKeyboardOption"></span>
138 <span class="checked-value" i18n-content="virtualKeyboardOptionOn"> 141 <span class="checked-value" i18n-content="virtualKeyboardOptionOn">
139 </span> 142 </span>
140 <span class="unchecked-value" i18n-content="virtualKeyboardOptionOff"> 143 <span class="unchecked-value" i18n-content="virtualKeyboardOptionOff">
141 </span> 144 </span>
142 </oobe-a11y-option> 145 </oobe-a11y-option>
143 </div> 146 </div>
144 <div class="bottom-buttons layout horizontal"> 147 <div class="bottom-buttons layout horizontal">
148 <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.
145 <oobe-text-button inverse on-tap="closeAccessibilitySection_" 149 <oobe-text-button inverse on-tap="closeAccessibilitySection_"
146 i18n-content="oobeOKButtonText"> 150 i18n-content="oobeOKButtonText">
147 </oobe-text-button> 151 </oobe-text-button>
148 </div> 152 </div>
149 </oobe-dialog> 153 </oobe-dialog>
150 <oobe-dialog id="networkSection" 154 <oobe-dialog id="networkSection"
151 hidden="[[!networkSelectionScreenShown]]"> 155 hidden="[[!networkSelectionScreenShown]]">
152 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> 156 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon>
153 <div class="header flex layout vertical end-justified start"> 157 <div class="header">
154 <h1 class="welcome-message" i18n-content="networkSectionTitle"></h1> 158 <h1 class="title" i18n-content="networkSectionTitle"></h1>
155 <h1 class="welcome-message-hint" i18n-content="networkSectionHint"></h1> 159 <div class="subtitle" i18n-content="networkSectionHint"></div>
156 </div> 160 </div>
157 <div class="footer flex layout vertical justified"> 161 <div class="footer layout vertical">
158 <cr-network-select id="networkSelect" 162 <cr-network-select id="networkSelect"
159 on-network-connected="onNetworkConnected_" 163 on-network-connected="onNetworkConnected_"
160 on-network-item-selected="onNetworkListNetworkItemSelected_" 164 on-network-item-selected="onNetworkListNetworkItemSelected_"
161 on-custom-item-selected="onNetworkListCustomItemSelected_" 165 on-custom-item-selected="onNetworkListCustomItemSelected_"
162 custom-items="[[_getNetworkCustomItems()]]" 166 custom-items="[[_getNetworkCustomItems()]]"
163 max-height="280"> 167 max-height="385">
164 </cr-network-select> 168 </cr-network-select>
165 </div> 169 </div>
166 </oobe-dialog> 170 </oobe-dialog>
167 </template> 171 </template>
168 </dom-module> 172 </dom-module>
169 173
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698