Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/action_link.html"> | 1 <link rel="import" href="chrome://resources/html/action_link.html"> |
| 2 <link rel="import" href="chrome://resources/html/cr.html"> | 2 <link rel="import" href="chrome://resources/html/cr.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> |
| 6 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 6 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 7 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html" > | 7 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html" > |
| 8 <link rel="import" href="/search_engines_page/search_engine_dialog.html"> | 8 <link rel="import" href="/search_engines_page/search_engine_dialog.html"> |
| 9 <link rel="import" href="/search_engines_page/search_engines_list.html"> | 9 <link rel="import" href="/search_engines_page/search_engines_list.html"> |
| 10 <link rel="import" href="/search_engines_page/omnibox_extension_entry.html"> | 10 <link rel="import" href="/search_engines_page/omnibox_extension_entry.html"> |
| 11 <link rel="import" href="/settings_shared_css.html"> | 11 <link rel="import" href="/settings_shared_css.html"> |
| 12 | 12 |
| 13 <dom-module id="settings-search-engines-page"> | 13 <dom-module id="settings-search-engines-page"> |
| 14 <link rel="import" type="css" href="chrome://resources/css/action_link.css"> | 14 <link rel="import" type="css" href="chrome://resources/css/action_link.css"> |
| 15 <template> | 15 <template> |
| 16 <style include="settings-shared"> | 16 <style include="settings-shared"> |
| 17 :host { | 17 :host { |
| 18 --search-engines-list-item-vertical-space: 8px; | 18 --search-engines-list-item-vertical-space: 8px; |
| 19 --search-engines-list-margin: 0 40px; | 19 --search-engines-list-margin: 0 36px; |
| 20 } | 20 } |
| 21 .label { | 21 |
| 22 margin: 20px; | |
| 23 } | |
| 24 .extension-engines { | 22 .extension-engines { |
| 25 margin: var(--search-engines-list-margin); | 23 margin: var(--search-engines-list-margin); |
| 26 } | 24 } |
| 27 </style> | 25 </style> |
| 28 <div> | 26 <div class="settings-box block"> |
|
hcarmona
2016/08/24 23:41:21
This is adding a dividing line between the header
dschuyler
2016/08/25 02:00:53
Ah, I changed this in the next CL, but it should b
| |
| 29 <div class="label">$i18n{searchEnginesDefault}</div> | 27 <h2>$i18n{searchEnginesDefault}</h2> |
| 30 <settings-search-engines-list engines="[[defaultEngines]]"> | 28 <settings-search-engines-list engines="[[defaultEngines]]"> |
| 31 </settings-search-engines-list> | 29 </settings-search-engines-list> |
| 32 </div> | 30 </div> |
| 33 <template is="dom-if" if="[[showAddSearchEngineDialog_]]" restamp> | 31 <template is="dom-if" if="[[showAddSearchEngineDialog_]]" restamp> |
| 34 <settings-search-engine-dialog></settings-search-engine-dialog> | 32 <settings-search-engine-dialog></settings-search-engine-dialog> |
| 35 </template> | 33 </template> |
| 36 <div> | 34 <div class="settings-box block"> |
|
hcarmona
2016/08/24 23:41:21
Same here for a dividing line between the lists.
dschuyler
2016/08/25 02:00:53
I think a line makes sense here. I haven't found m
| |
| 37 <div class="label">$i18n{searchEnginesOther}</div> | 35 <h2>$i18n{searchEnginesOther}</h2> |
| 38 <!-- TODO(dbeam): why does on-click work with keyboard but on-tap | 36 <!-- TODO(dbeam): why does on-click work with keyboard but on-tap |
| 39 doesn't? --> | 37 doesn't? --> |
| 40 <settings-search-engines-list engines="[[otherEngines]]"> | 38 <settings-search-engines-list engines="[[otherEngines]]"> |
| 41 <a is="action-link" on-tap="onAddSearchEngineTap_" id="addSearchEngine"> | 39 <a is="action-link" on-tap="onAddSearchEngineTap_" id="addSearchEngine"> |
| 42 $i18n{searchEnginesAddSearchEngine}</a> | 40 $i18n{searchEnginesAddSearchEngine}</a> |
| 43 </settings-search-engines-list> | 41 </settings-search-engines-list> |
| 44 | 42 |
| 45 <template is="dom-if" if="[[showExtensionsList_]]"> | 43 <template is="dom-if" if="[[showExtensionsList_]]"> |
| 46 <div class="label">$i18n{searchEnginesExtension}</div> | 44 <h2>$i18n{searchEnginesExtension}</h2> |
| 47 <iron-list items="[[extensions]]" class="extension-engines" selectable> | 45 <iron-list items="[[extensions]]" class="extension-engines" selectable> |
| 48 <template> | 46 <template> |
| 49 <settings-omnibox-extension-entry engine="[[item]]" | 47 <settings-omnibox-extension-entry engine="[[item]]" |
| 50 tabindex$="[[tabIndex]]"> | 48 tabindex$="[[tabIndex]]"> |
| 51 </settings-omnibox-extension-entry> | 49 </settings-omnibox-extension-entry> |
| 52 </template> | 50 </template> |
| 53 </iron-list> | 51 </iron-list> |
| 54 </template> | 52 </template> |
| 55 </div> | 53 </div> |
| 56 </template> | 54 </template> |
| 57 <script src="search_engines_page.js"></script> | 55 <script src="search_engines_page.js"></script> |
| 58 </dom-module> | 56 </dom-module> |
| OLD | NEW |