Chromium Code Reviews| 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/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> |
| 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> | 4 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> |
| 5 <link rel="import" href="/settings_shared_css.html"> | 5 <link rel="import" href="/settings_shared_css.html"> |
| 6 <link rel="import" href="/on_startup_page/startup_url_dialog.html"> | 6 <link rel="import" href="/on_startup_page/startup_url_dialog.html"> |
| 7 <link rel="import" href="/on_startup_page/startup_url_entry.html"> | 7 <link rel="import" href="/on_startup_page/startup_url_entry.html"> |
| 8 <link rel="import" href="/on_startup_page/startup_urls_page_browser_proxy.html"> | 8 <link rel="import" href="/on_startup_page/startup_urls_page_browser_proxy.html"> |
| 9 | 9 |
| 10 <dom-module id="settings-startup-urls-page"> | 10 <dom-module id="settings-startup-urls-page"> |
| 11 <template> | 11 <template> |
| 12 <style include="settings-shared"> | 12 <style include="settings-shared"> |
| 13 #outer { | 13 #outer { |
| 14 @apply(--settings-list-frame-padding); | 14 @apply(--settings-list-frame-padding); |
| 15 max-height: 395px; /** Enough height to show six entries. */ | 15 max-height: 395px; /** Enough height to show six entries. */ |
| 16 } | 16 } |
| 17 | |
| 17 #container iron-list > settings-startup-url-entry:not(:first-of-type) { | 18 #container iron-list > settings-startup-url-entry:not(:first-of-type) { |
| 18 border-top: var(--settings-separator-line); | 19 border-top: var(--settings-separator-line); |
| 19 } | 20 } |
| 21 | |
| 22 #container { | |
| 23 overflow: inherit; | |
| 24 } | |
|
stevenjb
2016/10/13 16:49:52
Is there a reason not to apply this to all .scroll
| |
| 20 </style> | 25 </style> |
| 21 <div id="outer" class="layout vertical flex"> | 26 <div id="outer" class="layout vertical flex"> |
| 22 <div id="container" class="scroll-container flex" scrollable> | 27 <div id="container" class="scroll-container flex" scrollable> |
| 23 <iron-list items="[[startupPages_]]" scroll-target="container"> | 28 <iron-list items="[[startupPages_]]" scroll-target="container"> |
| 24 <template> | 29 <template> |
| 25 <settings-startup-url-entry model="[[item]]" | 30 <settings-startup-url-entry model="[[item]]" |
| 26 tabindex$="[[tabIndex]]"> | 31 tabindex$="[[tabIndex]]"> |
| 27 </settings-startup-url-entry> | 32 </settings-startup-url-entry> |
| 28 </template> | 33 </template> |
| 29 </iron-list> | 34 </iron-list> |
| 30 </div> | 35 </div> |
| 31 <div class="list-item list-button" id="addPage" on-tap="onAddPageTap_"> | 36 <div class="list-item list-button" id="addPage" on-tap="onAddPageTap_"> |
| 32 $i18n{onStartupAddNewPage} | 37 $i18n{onStartupAddNewPage} |
| 33 </div> | 38 </div> |
| 34 <div class="list-item list-button" id="useCurrentPages" | 39 <div class="list-item list-button" id="useCurrentPages" |
| 35 on-tap="onUseCurrentPagesTap_">$i18n{onStartupUseCurrent}</div> | 40 on-tap="onUseCurrentPagesTap_">$i18n{onStartupUseCurrent}</div> |
| 36 </div> | 41 </div> |
| 37 <template is="dom-if" if="[[showStartupUrlDialog_]]" restamp> | 42 <template is="dom-if" if="[[showStartupUrlDialog_]]" restamp> |
| 38 <settings-startup-url-dialog model="[[startupUrlDialogModel_]]"> | 43 <settings-startup-url-dialog model="[[startupUrlDialogModel_]]"> |
| 39 </settings-startup-url-dialog> | 44 </settings-startup-url-dialog> |
| 40 </template> | 45 </template> |
| 41 </template> | 46 </template> |
| 42 <script src="startup_urls_page.js"></script> | 47 <script src="startup_urls_page.js"></script> |
| 43 </dom-module> | 48 </dom-module> |
| OLD | NEW |