| 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/html/promise_resolver.html"> |
| 4 <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"> |
| 5 <link rel="import" href="/about_page/about_page.html"> | 5 <link rel="import" href="/about_page/about_page.html"> |
| 6 <link rel="import" href="/advanced_page/advanced_page.html"> | 6 <link rel="import" href="/advanced_page/advanced_page.html"> |
| 7 <link rel="import" href="/basic_page/basic_page.html"> | 7 <link rel="import" href="/basic_page/basic_page.html"> |
| 8 <link rel="import" href="/route.html"> | 8 <link rel="import" href="/route.html"> |
| 9 <link rel="import" href="/settings_page/main_page_behavior.html"> | 9 <link rel="import" href="/settings_page/main_page_behavior.html"> |
| 10 <link rel="import" href="/settings_vars_css.html"> | 10 <link rel="import" href="/settings_vars_css.html"> |
| 11 | 11 |
| 12 <dom-module id="settings-main"> | 12 <dom-module id="settings-main"> |
| 13 <template> | 13 <template> |
| 14 <style> | 14 <style> |
| 15 #advancedToggle { | 15 #advancedToggle { |
| 16 @apply(--settings-actionable); | 16 @apply(--settings-actionable); |
| 17 align-items: center; | 17 align-items: center; |
| 18 display: flex; | 18 display: flex; |
| 19 margin-bottom: 24px; | 19 margin-bottom: 3px; |
| 20 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ | 20 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ |
| 21 min-height: 32px; | 21 min-height: 32px; |
| 22 padding: 0 12px; | 22 padding: 0 12px; |
| 23 } | 23 } |
| 24 | 24 |
| 25 #overscroll { |
| 26 margin-top: 64px; |
| 27 } |
| 28 |
| 25 #toggleContainer { | 29 #toggleContainer { |
| 26 align-items: center; | 30 align-items: center; |
| 27 display: flex; | 31 display: flex; |
| 28 justify-content: center; | 32 justify-content: center; |
| 29 margin-bottom: calc(-1 * var(--settings-page-vertical-margin)); | |
| 30 } | 33 } |
| 31 | 34 |
| 32 #toggleSpacer { | 35 #toggleSpacer { |
| 33 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ | 36 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ |
| 34 } | 37 } |
| 35 | 38 |
| 36 iron-icon { | 39 iron-icon { |
| 37 -webkit-margin-start: 16px; | 40 -webkit-margin-start: 16px; |
| 38 } | 41 } |
| 39 | 42 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 <settings-advanced-page prefs="{{prefs}}" | 78 <settings-advanced-page prefs="{{prefs}}" |
| 76 current-route="{{currentRoute}}" | 79 current-route="{{currentRoute}}" |
| 77 page-visibility="[[pageVisibility]]"> | 80 page-visibility="[[pageVisibility]]"> |
| 78 </settings-advanced-page> | 81 </settings-advanced-page> |
| 79 </template> | 82 </template> |
| 80 </template> | 83 </template> |
| 81 <template is="dom-if" if="[[showPages_.about]]"> | 84 <template is="dom-if" if="[[showPages_.about]]"> |
| 82 <settings-about-page current-route="{{currentRoute}}"> | 85 <settings-about-page current-route="{{currentRoute}}"> |
| 83 </settings-about-page> | 86 </settings-about-page> |
| 84 </template> | 87 </template> |
| 85 <div id="overscroll"></div> | 88 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> |
| 86 </template> | 89 </template> |
| 87 <script src="settings_main.js"></script> | 90 <script src="settings_main.js"></script> |
| 88 <script src="/search_settings.js"></script> | 91 <script src="/search_settings.js"></script> |
| 89 </dom-module> | 92 </dom-module> |
| OLD | NEW |