OLD | NEW |
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> |
2 <link rel="import" href="../appearance_page/appearance_page.html"> | 3 <link rel="import" href="../appearance_page/appearance_page.html"> |
3 <link rel="import" href="../controls/settings_idle_load.html"> | 4 <link rel="import" href="../controls/settings_idle_load.html"> |
4 <link rel="import" href="../on_startup_page/on_startup_page.html"> | 5 <link rel="import" href="../on_startup_page/on_startup_page.html"> |
5 <link rel="import" href="../people_page/people_page.html"> | 6 <link rel="import" href="../people_page/people_page.html"> |
6 <link rel="import" href="../reset_page/reset_profile_banner.html"> | 7 <link rel="import" href="../reset_page/reset_profile_banner.html"> |
7 <link rel="import" href="../search_page/search_page.html"> | 8 <link rel="import" href="../search_page/search_page.html"> |
8 <link rel="import" href="../settings_page/main_page_behavior.html"> | 9 <link rel="import" href="../settings_page/main_page_behavior.html"> |
9 <link rel="import" href="../settings_page/settings_page_visibility.html"> | 10 <link rel="import" href="../settings_page/settings_page_visibility.html"> |
10 <link rel="import" href="../settings_page/settings_section.html"> | 11 <link rel="import" href="../settings_page/settings_section.html"> |
11 <link rel="import" href="../settings_page_css.html"> | 12 <link rel="import" href="../settings_page_css.html"> |
12 <link rel="import" href="../settings_vars_css.html"> | 13 <link rel="import" href="../settings_vars_css.html"> |
13 | 14 |
14 <if expr="chromeos"> | 15 <if expr="chromeos"> |
15 <link rel="import" href="../android_apps_page/android_apps_page.html"> | 16 <link rel="import" href="../android_apps_page/android_apps_page.html"> |
16 <link rel="import" href="../bluetooth_page/bluetooth_page.html"> | 17 <link rel="import" href="../bluetooth_page/bluetooth_page.html"> |
17 <link rel="import" href="../device_page/device_page.html"> | 18 <link rel="import" href="../device_page/device_page.html"> |
18 <link rel="import" href="../internet_page/internet_page.html"> | 19 <link rel="import" href="../internet_page/internet_page.html"> |
19 </if> | 20 </if> |
20 | 21 |
21 <if expr="not chromeos"> | 22 <if expr="not chromeos"> |
22 <link rel="import" href="../default_browser_page/default_browser_page.html"> | 23 <link rel="import" href="../default_browser_page/default_browser_page.html"> |
23 </if> | 24 </if> |
24 | 25 |
25 <!-- TODO(michaelpg): Rename to something better than "basic" now that this page | 26 <!-- TODO(michaelpg): Rename to something better than "basic" now that this page |
26 includes both the basic and advanced settings. --> | 27 includes both the basic and advanced settings. --> |
27 <dom-module id="settings-basic-page"> | 28 <dom-module id="settings-basic-page"> |
28 <template> | 29 <template> |
29 <style include="settings-page-styles"> | 30 <style include="settings-page-styles cr-hidden-style"> |
30 :host([is-subpage-animating]) { | 31 :host([is-subpage-animating]) { |
31 /* Prevent an unwanted horizontal scrollbar when transitioning back from | 32 /* Prevent an unwanted horizontal scrollbar when transitioning back from |
32 * a sub-page. */ | 33 * a sub-page. */ |
33 overflow: hidden; | 34 overflow: hidden; |
34 } | 35 } |
35 | 36 |
36 #advancedToggle { | 37 #advancedToggle { |
37 --paper-button: { | 38 --paper-button: { |
38 text-transform: none; | 39 text-transform: none; |
39 } | 40 } |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 section="reset"> | 267 section="reset"> |
267 <settings-reset-page></settings-reset-page> | 268 <settings-reset-page></settings-reset-page> |
268 </settings-section> | 269 </settings-section> |
269 </template> | 270 </template> |
270 </div> | 271 </div> |
271 </template> | 272 </template> |
272 </template> | 273 </template> |
273 </template> | 274 </template> |
274 <script src="basic_page.js"></script> | 275 <script src="basic_page.js"></script> |
275 </dom-module> | 276 </dom-module> |
OLD | NEW |