Chromium Code Reviews| Index: chrome/browser/resources/chromeos/login/oobe_screen_network.html |
| diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_network.html b/chrome/browser/resources/chromeos/login/oobe_screen_network.html |
| index ffa420c28d2ede6d2e622499fd54305ef7afd0d8..2b2feecd325081d0f4ca9e4e0a58eb0fb1503eb1 100644 |
| --- a/chrome/browser/resources/chromeos/login/oobe_screen_network.html |
| +++ b/chrome/browser/resources/chromeos/login/oobe_screen_network.html |
| @@ -1,45 +1,67 @@ |
| +<!-- Copyright 2016 The Chromium Authors. All rights reserved. |
| + 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"> |
|
jdufault
2016/05/11 22:07:43
newline between copyright and imports
Alexander Alekseev
2016/05/13 20:52:34
Done.
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/slide-from-left-animation.html"> |
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/slide-from-right-animation.html"> |
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/slide-left-animation.html"> |
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/slide-right-animation.html"> |
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html"> |
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animated-pages.html"> |
| +<link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dialog.html"> |
| + |
| + |
| + |
| +<!-- -------------------------------------------------------- --> |
|
jdufault
2016/05/11 22:07:43
Remove this divider.
Alexander Alekseev
2016/05/13 20:52:34
Done.
|
| <div class="step hidden animated" id="connect" role="group" hidden> |
| - <div class="step-contents"> |
| - <div id="welcome-message" i18n-content="networkScreenGreeting"> |
| + <div id="oobe-poly-connect"> |
| + <div class="step-contents"> |
| + <oobe-poly-welcome id="oobe-poly-welcome" class="fit show"></oobe-poly-welcome> |
| </div> |
| - <div class="control-with-label"> |
| - <label for="language-select" i18n-content="selectLanguage" |
| - class="label"></label> |
| - <div class="menu-area"> |
| - <select id="language-select" class="menu-control"></select> |
| + </div> |
| + <div id="oobe-classic-connect"> |
| + <div class="step-contents"> |
| + <div id="welcome-message" i18n-content="networkScreenGreeting"> |
| </div> |
| - </div> |
| - <div class="control-with-label"> |
| - <label for="keyboard-select" i18n-content="selectKeyboard" |
| - class="label"></label> |
| - <div class="menu-area"> |
| - <select id="keyboard-select" class="menu-control"></select> |
| + <div class="control-with-label"> |
| + <label for="language-select" i18n-content="selectLanguage" |
| + class="label"></label> |
| + <div class="menu-area"> |
| + <select id="language-select" class="menu-control"></select> |
| + </div> |
| </div> |
| - </div> |
| - <div class="control-with-label" id="network-timezone-setting"> |
| - <label for="timezone-select" i18n-content="selectTimezone" |
| - class="label"></label> |
| - <div class="menu-area"> |
| - <select id="timezone-select" class="menu-control"></select> |
| + <div class="control-with-label"> |
| + <label for="keyboard-select" i18n-content="selectKeyboard" |
| + class="label"></label> |
| + <div class="menu-area"> |
| + <select id="keyboard-select" class="menu-control"></select> |
| + </div> |
| </div> |
| - </div> |
| - <div class="control-with-label"> |
| - <label for="networks-list-dropdown" i18n-content="selectNetwork" |
| - class="label"></label> |
| - <div class="menu-area"> |
| - <div id="networks-list" class="menu-control"></div> |
| + <div class="control-with-label" id="network-timezone-setting"> |
| + <label for="timezone-select" i18n-content="selectTimezone" |
| + class="label"></label> |
| + <div class="menu-area"> |
| + <select id="timezone-select" class="menu-control"></select> |
| + </div> |
| + </div> |
| + <div class="control-with-label"> |
| + <label for="networks-list-dropdown" i18n-content="selectNetwork" |
| + class="label"></label> |
| + <div class="menu-area"> |
| + <div id="networks-list" class="menu-control"></div> |
| + </div> |
| </div> |
| </div> |
| - </div> |
| - <div id="connect-controls" class="step-controls"></div> |
| - <div id="connect-extra-controls" class="step-extra-controls"> |
| - <div id="connect-accessibility"> |
| - <a id="connect-accessibility-link" href="#" role="button" |
| - i18n-content="accessibilityLink"></a> |
| - </div> |
| - <div class="connect-debugging-specific"> |
| - <a id="connect-debugging-features-link" href="#" role="button" |
| - i18n-content="debuggingFeaturesLink"></a> |
| + <div id="connect-controls" class="step-controls"></div> |
| + <div id="connect-extra-controls" class="step-extra-controls"> |
| + <div id="connect-accessibility"> |
| + <a id="connect-accessibility-link" href="#" role="button" |
| + i18n-content="accessibilityLink"></a> |
| + </div> |
| + <div class="connect-debugging-specific"> |
| + <a id="connect-debugging-features-link" href="#" role="button" |
| + i18n-content="debuggingFeaturesLink"></a> |
| + </div> |
| </div> |
| </div> |
| </div> |