OLD | NEW |
1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/html/promise_resolver.html"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
4 <link rel="import" href="/about_page/about_page.html"> | 5 <link rel="import" href="/about_page/about_page.html"> |
5 <link rel="import" href="/advanced_page/advanced_page.html"> | 6 <link rel="import" href="/advanced_page/advanced_page.html"> |
6 <link rel="import" href="/basic_page/basic_page.html"> | 7 <link rel="import" href="/basic_page/basic_page.html"> |
| 8 <link rel="import" href="/settings_main/settings_main_rendered.html"> |
7 <link rel="import" href="/settings_page/main_page_behavior.html"> | 9 <link rel="import" href="/settings_page/main_page_behavior.html"> |
8 | 10 |
9 <dom-module id="settings-main"> | 11 <dom-module id="settings-main"> |
10 <template> | 12 <template> |
11 <style> | 13 <style> |
12 #advancedToggle { | 14 #advancedToggle { |
13 align-items: center; | 15 align-items: center; |
14 display: flex; | 16 display: flex; |
15 margin-bottom: 24px; | 17 margin-bottom: 24px; |
16 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ | 18 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 current-route="{{currentRoute}}"> | 54 current-route="{{currentRoute}}"> |
53 </settings-advanced-page> | 55 </settings-advanced-page> |
54 </template> | 56 </template> |
55 <template is="dom-if" if="[[showAboutPage_]]"> | 57 <template is="dom-if" if="[[showAboutPage_]]"> |
56 <settings-about-page current-route="{{currentRoute}}"> | 58 <settings-about-page current-route="{{currentRoute}}"> |
57 </settings-about-page> | 59 </settings-about-page> |
58 </template> | 60 </template> |
59 </template> | 61 </template> |
60 <script src="settings_main.js"></script> | 62 <script src="settings_main.js"></script> |
61 </dom-module> | 63 </dom-module> |
OLD | NEW |