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 | 2 |
| 3 <link rel="import" href="chrome://resources/html/action_link.html"> | 3 <link rel="import" href="chrome://resources/html/action_link.html"> |
| 4 <link rel="import" href="chrome://resources/html/action_link_css.html"> | 4 <link rel="import" href="chrome://resources/html/action_link_css.html"> |
| 5 <link rel="import" href="chrome://resources/html/assert.html"> | 5 <link rel="import" href="chrome://resources/html/assert.html"> |
| 6 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 6 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> |
| 9 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 9 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 10 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> | 10 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> |
| 11 <link rel="import" href="../controls/extension_controlled_indicator.html"> | 11 <link rel="import" href="../controls/extension_controlled_indicator.html"> |
| 12 <link rel="import" href="../settings_shared_css.html"> | 12 <link rel="import" href="../settings_shared_css.html"> |
| 13 <link rel="import" href="startup_url_dialog.html"> | 13 <link rel="import" href="startup_url_dialog.html"> |
| 14 <link rel="import" href="startup_url_entry.html"> | 14 <link rel="import" href="startup_url_entry.html"> |
| 15 <link rel="import" href="startup_urls_page_browser_proxy.html"> | 15 <link rel="import" href="startup_urls_page_browser_proxy.html"> |
| 16 | 16 |
| 17 <dom-module id="settings-startup-urls-page"> | 17 <dom-module id="settings-startup-urls-page"> |
| 18 <template> | 18 <template> |
| 19 <style include="settings-shared action-link iron-flex"> | 19 <style include="settings-shared action-link iron-flex"> |
| 20 #outer { | 20 #outer { |
| 21 @apply(--settings-list-frame-padding); | 21 @apply(--settings-list-frame-padding); |
| 22 max-height: 395px; /** Enough height to show six entries. */ | 22 max-height: 395px; /** Enough height to show six entries. */ |
| 23 } | 23 } |
| 24 | 24 |
| 25 #container { | |
| 26 overflow: visible; /* Allow ripple to go outside of the row. */ | |
| 27 } | |
|
stevenjb
2017/05/25 22:28:17
We might want to do this separately, it's not comp
| |
| 28 | |
| 25 #container iron-list > settings-startup-url-entry:not(:first-of-type) { | 29 #container iron-list > settings-startup-url-entry:not(:first-of-type) { |
| 26 border-top: var(--settings-separator-line); | 30 border-top: var(--settings-separator-line); |
| 27 } | 31 } |
| 28 | 32 |
| 29 #container settings-startup-url-entry { | 33 #container settings-startup-url-entry { |
| 30 cursor: default; | 34 cursor: default; |
| 31 } | 35 } |
| 32 </style> | 36 </style> |
| 33 <div id="outer" class="layout vertical flex vertical-list"> | 37 <div id="outer" class="layout vertical flex vertical-list"> |
| 34 <div id="container" class="scroll-container" scrollable> | 38 <div id="container" class="scroll-container" scrollable> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 67 </template> | 71 </template> |
| 68 </div> | 72 </div> |
| 69 <template is="dom-if" if="[[showStartupUrlDialog_]]" restamp> | 73 <template is="dom-if" if="[[showStartupUrlDialog_]]" restamp> |
| 70 <settings-startup-url-dialog model="[[startupUrlDialogModel_]]" | 74 <settings-startup-url-dialog model="[[startupUrlDialogModel_]]" |
| 71 on-close="destroyUrlDialog_"> | 75 on-close="destroyUrlDialog_"> |
| 72 </settings-startup-url-dialog> | 76 </settings-startup-url-dialog> |
| 73 </template> | 77 </template> |
| 74 </template> | 78 </template> |
| 75 <script src="startup_urls_page.js"></script> | 79 <script src="startup_urls_page.js"></script> |
| 76 </dom-module> | 80 </dom-module> |
| OLD | NEW |