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

Side by Side Diff: chrome/browser/resources/chromeos/login/oobe_welcome.html

Issue 2267533002: ChromeOS: Update styles of material design OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove dependency/ 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">
23 <link rel="stylesheet" href="oobe_welcome.css">
24 <link rel="stylesheet" href="oobe_dialog_parameters.css">
25 <template> 22 <template>
26 <oobe-card id="welcomeSection" hidden="[[!welcomeScreenShown]]"> 23 <link rel="stylesheet" href="oobe_dialog_host.css">
27 <div class="header flex vertical layout end-justified start"> 24 <link rel="stylesheet" href="oobe_welcome.css">
28 <h1 class="welcome-message" i18n-content="networkScreenGreeting"></h1> 25 <link rel="stylesheet" href="oobe_dialog_parameters.css">
26 <oobe-dialog id="welcomeScreen" hidden="[[!welcomeScreenShown]]"
27 welcome-screen>
28 <div class="header layout vertical end-justified center">
29 <h1 class="title" i18n-content="networkScreenGreeting"></h1>
29 </div> 30 </div>
30 <div class="footer flex vertical layout justified"> 31 <div class="footer flex layout vertical center">
31 <div class="welcome-next flex layout vertical center"> 32 <img id="welcomeIllustration" src="images/welcome_illustration_1x.png">
michaelpg 2016/08/26 06:33:44 id unused?
Alexander Alekseev 2016/08/26 10:49:10 It is referenced on top of the style file: #welco
32 <oobe-next-button id="welcomeNextButton" 33 </img>
michaelpg 2016/08/26 06:33:44 <img> doesn't use closing tags
Alexander Alekseev 2016/08/26 10:49:10 Done.
33 on-tap="onWelcomeNextButtonClicked_"> 34 <oobe-text-button id="welcomeNextButton" inverse
34 </oobe-next-button> 35 on-tap="onWelcomeNextButtonClicked_"
35 </div> 36 i18n-content="welcomeNextButtonText">
36 <div class="flex horizontal layout justified"> 37 </oobe-text-button>
37 <div class="buttonbox layout vertical" 38 <div id="welcomeButtons" class="flex horizontal layout justified">
39 <div class="layout vertical relative"
38 on-tap="onWelcomeSelectLanguageButtonClicked_"> 40 on-tap="onWelcomeSelectLanguageButtonClicked_">
39 <iron-icon icon="icons:language" class="bottom-button self-center"> 41 <iron-icon icon="icons:language" class="action-icon">
40 </iron-icon> 42 </iron-icon>
41 <div id="currentLanguage">[[currentLanguage]]</div> 43 <div class="buttonbox-text">[[currentLanguage]]</div>
42 </div> 44 </div>
43 <div class="buttonbox layout vertical" 45 <div class="action-icon-spacer"></div>
46 <div class="layout vertical relative"
44 on-tap="onWelcomeAccessibilityButtonClicked_"> 47 on-tap="onWelcomeAccessibilityButtonClicked_">
45 <iron-icon icon="icons:accessibility" 48 <iron-icon icon="icons:accessibility" class="action-icon">
46 class="bottom-button self-center">
47 </iron-icon> 49 </iron-icon>
48 <div id="accessibilityLabel" i18n-content="accessibilityLink"></div> 50 <div class="buttonbox-text" i18n-content="accessibilityLink"></div>
49 </div> 51 </div>
50 </div> 52 </div>
51 </div> 53 </div>
52 </oobe-card> 54 </oobe-dialog>
53 <oobe-dialog hidden="[[!languageSelectionScreenShown]]" 55 <oobe-dialog id="languageScreen" hidden="[[!languageSelectionScreenShown]]"
54 has-buttons> 56 has-buttons>
55 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon> 57 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon>
56 <div class="header"> 58 <div class="header">
57 <h1 class="title" i18n-content="languageSectionTitle"></h1> 59 <h1 class="title" i18n-content="languageSectionTitle"></h1>
58 </div> 60 </div>
59 <div class="footer layout vertical"> 61 <div class="footer layout vertical">
60 <template is="dom-if" if="[[enabled]]"> 62 <template is="dom-if" if="[[enabled]]">
61 <div id="languageDropdownContainer" 63 <div id="languageDropdownContainer"
62 class="flex layout horizontal justified language-selection-entry"> 64 class="flex layout horizontal justified language-selection-entry">
63 <div class="language-selection-title layout vertical center-justifie d" 65 <div class="language-selection-title layout vertical center-justifie d"
64 i18n-content="languageDropdownTitle"> 66 i18n-content="languageDropdownTitle">
(...skipping 14 matching lines...) Expand all
79 </oobe-i18n-dropdown> 81 </oobe-i18n-dropdown>
80 </div> 82 </div>
81 </template> 83 </template>
82 </div> 84 </div>
83 <div class="bottom-buttons layout horizontal end-justified"> 85 <div class="bottom-buttons layout horizontal end-justified">
84 <oobe-text-button inverse on-tap="closeLanguageSection_" 86 <oobe-text-button inverse on-tap="closeLanguageSection_"
85 i18n-content="oobeOKButtonText"> 87 i18n-content="oobeOKButtonText">
86 </oobe-text-button> 88 </oobe-text-button>
87 </div> 89 </div>
88 </oobe-dialog> 90 </oobe-dialog>
89 <oobe-dialog hidden="[[!accessibilityOptionsScreenShown]]" 91 <oobe-dialog id="accessibilityScreen"
90 has-buttons> 92 hidden="[[!accessibilityOptionsScreenShown]]" has-buttons>
91 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon> 93 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon>
92 <div class="header"> 94 <div class="header">
93 <h1 class="title" i18n-content="accessibilitySectionTitle"></h1> 95 <h1 class="title" i18n-content="accessibilitySectionTitle"></h1>
94 <div class="subtitle" i18n-content="accessibilitySectionHint"></div> 96 <div class="subtitle" i18n-content="accessibilitySectionHint"></div>
95 </div> 97 </div>
96 <div class="footer layout vertical"> 98 <div class="footer layout vertical">
97 <oobe-a11y-option checked="[[a11yStatus.spokenFeedbackEnabled]]" 99 <oobe-a11y-option checked="[[a11yStatus.spokenFeedbackEnabled]]"
98 on-change="onA11yOptionChanged_" 100 on-change="onA11yOptionChanged_"
99 chrome-message="enableSpokenFeedback"> 101 chrome-message="enableSpokenFeedback">
100 <span class="title" i18n-content="spokenFeedbackOption"></span> 102 <span class="title" i18n-content="spokenFeedbackOption"></span>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 <span class="unchecked-value" i18n-content="virtualKeyboardOptionOff"> 141 <span class="unchecked-value" i18n-content="virtualKeyboardOptionOff">
140 </span> 142 </span>
141 </oobe-a11y-option> 143 </oobe-a11y-option>
142 </div> 144 </div>
143 <div class="bottom-buttons layout horizontal end-justified"> 145 <div class="bottom-buttons layout horizontal end-justified">
144 <oobe-text-button inverse on-tap="closeAccessibilitySection_" 146 <oobe-text-button inverse on-tap="closeAccessibilitySection_"
145 i18n-content="oobeOKButtonText"> 147 i18n-content="oobeOKButtonText">
146 </oobe-text-button> 148 </oobe-text-button>
147 </div> 149 </div>
148 </oobe-dialog> 150 </oobe-dialog>
149 <oobe-dialog id="networkSection" 151 <oobe-dialog hidden="[[!networkSelectionScreenShown]]">
150 hidden="[[!networkSelectionScreenShown]]">
151 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> 152 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon>
152 <div class="header"> 153 <div class="header">
153 <h1 class="title" i18n-content="networkSectionTitle"></h1> 154 <h1 class="title" i18n-content="networkSectionTitle"></h1>
154 <div class="subtitle" i18n-content="networkSectionHint"></div> 155 <div class="subtitle" i18n-content="networkSectionHint"></div>
155 </div> 156 </div>
156 <div class="footer layout vertical"> 157 <div class="footer layout vertical">
157 <cr-network-select id="networkSelect" 158 <cr-network-select id="networkSelect"
158 on-network-connected="onNetworkConnected_" 159 on-network-connected="onNetworkConnected_"
159 on-network-item-selected="onNetworkListNetworkItemSelected_" 160 on-network-item-selected="onNetworkListNetworkItemSelected_"
160 on-custom-item-selected="onNetworkListCustomItemSelected_" 161 on-custom-item-selected="onNetworkListCustomItemSelected_"
161 custom-items="[[_getNetworkCustomItems()]]" 162 custom-items="[[_getNetworkCustomItems()]]"
162 max-height="385"> 163 max-height="385">
163 </cr-network-select> 164 </cr-network-select>
164 </div> 165 </div>
165 </oobe-dialog> 166 </oobe-dialog>
166 </template> 167 </template>
167 </dom-module> 168 </dom-module>
168
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698