| 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="../appearance_page/appearance_page.html"> | 2 <link rel="import" href="../appearance_page/appearance_page.html"> |
| 3 <link rel="import" href="../controls/settings_idle_render.html"> | 3 <link rel="import" href="../controls/settings_idle_render.html"> |
| 4 <link rel="import" href="../lazy_load.html"> | 4 <link rel="import" href="../lazy_load.html"> |
| 5 <link rel="import" href="../on_startup_page/on_startup_page.html"> | 5 <link rel="import" href="../on_startup_page/on_startup_page.html"> |
| 6 <link rel="import" href="../people_page/people_page.html"> | 6 <link rel="import" href="../people_page/people_page.html"> |
| 7 <link rel="import" href="../reset_page/reset_profile_banner.html"> | 7 <link rel="import" href="../reset_page/reset_profile_banner.html"> |
| 8 <link rel="import" href="../search_page/search_page.html"> | 8 <link rel="import" href="../search_page/search_page.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_page/settings_page_visibility.html"> | 10 <link rel="import" href="../settings_page/settings_page_visibility.html"> |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 | 21 |
| 22 <if expr="not chromeos"> | 22 <if expr="not chromeos"> |
| 23 <link rel="import" href="../default_browser_page/default_browser_page.html"> | 23 <link rel="import" href="../default_browser_page/default_browser_page.html"> |
| 24 </if> | 24 </if> |
| 25 | 25 |
| 26 <!-- 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 |
| 27 includes both the basic and advanced settings. --> | 27 includes both the basic and advanced settings. --> |
| 28 <dom-module id="settings-basic-page"> | 28 <dom-module id="settings-basic-page"> |
| 29 <template> | 29 <template> |
| 30 <style include="settings-page-styles"> | 30 <style include="settings-page-styles"> |
| 31 :host([is-subpage-animating]) { |
| 32 /* Prevent an unwanted horizontal scrollbar when transitioning back from |
| 33 * a sub-page. */ |
| 34 overflow: hidden; |
| 35 } |
| 36 |
| 31 #advancedToggle { | 37 #advancedToggle { |
| 32 --paper-button: { | 38 --paper-button: { |
| 33 text-transform: none; | 39 text-transform: none; |
| 34 } | 40 } |
| 35 @apply(--settings-actionable); | 41 @apply(--settings-actionable); |
| 36 align-items: center; | 42 align-items: center; |
| 37 display: flex; | 43 display: flex; |
| 38 margin-bottom: 3px; | 44 margin-bottom: 3px; |
| 39 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ | 45 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ |
| 40 min-height: 32px; | 46 min-height: 32px; |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 section="reset"> | 266 section="reset"> |
| 261 <settings-reset-page></settings-reset-page> | 267 <settings-reset-page></settings-reset-page> |
| 262 </settings-section> | 268 </settings-section> |
| 263 </template> | 269 </template> |
| 264 </div> | 270 </div> |
| 265 </template> | 271 </template> |
| 266 </template> | 272 </template> |
| 267 </template> | 273 </template> |
| 268 <script src="basic_page.js"></script> | 274 <script src="basic_page.js"></script> |
| 269 </dom-module> | 275 </dom-module> |
| OLD | NEW |