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