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 .extension-engines { |
18 --search-engines-list-item-vertical-space: 8px; | 18 @apply(--settings-list-frame-padding); |
19 --search-engines-list-margin: 0 40px; | |
20 } | 19 } |
21 .label { | 20 |
22 margin: 20px; | 21 settings-omnibox-extension-entry { |
| 22 border-top: var(--settings-separator-line); |
23 } | 23 } |
24 .extension-engines { | 24 |
25 margin: var(--search-engines-list-margin); | 25 settings-omnibox-extension-entry:first-of-type { |
| 26 border-top: none; |
26 } | 27 } |
27 </style> | 28 </style> |
28 <div> | 29 <div class="settings-box first"> |
29 <div class="label">$i18n{searchEnginesDefault}</div> | 30 <h2>$i18n{searchEnginesDefault}</h2> |
30 <settings-search-engines-list engines="[[defaultEngines]]"> | |
31 </settings-search-engines-list> | |
32 </div> | 31 </div> |
| 32 <settings-search-engines-list engines="[[defaultEngines]]"> |
| 33 </settings-search-engines-list> |
33 <template is="dom-if" if="[[showAddSearchEngineDialog_]]" restamp> | 34 <template is="dom-if" if="[[showAddSearchEngineDialog_]]" restamp> |
34 <settings-search-engine-dialog></settings-search-engine-dialog> | 35 <settings-search-engine-dialog></settings-search-engine-dialog> |
35 </template> | 36 </template> |
36 <div> | 37 <div class="settings-box first"> |
37 <div class="label">$i18n{searchEnginesOther}</div> | 38 <h2>$i18n{searchEnginesOther}</h2> |
38 <!-- TODO(dbeam): why does on-click work with keyboard but on-tap | 39 </div> |
39 doesn't? --> | 40 <!-- TODO(dbeam): why does on-click work with keyboard but on-tap |
40 <settings-search-engines-list engines="[[otherEngines]]"> | 41 doesn't? --> |
41 <a is="action-link" on-tap="onAddSearchEngineTap_" id="addSearchEngine"> | 42 <settings-search-engines-list engines="[[otherEngines]]"> |
42 $i18n{searchEnginesAddSearchEngine}</a> | 43 <a class="list-item list-button" is="action-link" |
43 </settings-search-engines-list> | 44 on-tap="onAddSearchEngineTap_" id="addSearchEngine"> |
| 45 $i18n{searchEnginesAddSearchEngine}</a> |
| 46 </settings-search-engines-list> |
44 | 47 |
45 <template is="dom-if" if="[[showExtensionsList_]]"> | 48 <template is="dom-if" if="[[showExtensionsList_]]"> |
46 <div class="label">$i18n{searchEnginesExtension}</div> | 49 <div class="settings-box first"> |
47 <iron-list items="[[extensions]]" class="extension-engines" selectable> | 50 <h2>$i18n{searchEnginesExtension}</h2> |
48 <template> | 51 </div> |
49 <settings-omnibox-extension-entry engine="[[item]]" | 52 <iron-list items="[[extensions]]" class="extension-engines" selectable> |
50 tabindex$="[[tabIndex]]"> | 53 <template> |
51 </settings-omnibox-extension-entry> | 54 <settings-omnibox-extension-entry engine="[[item]]" |
52 </template> | 55 tabindex$="[[tabIndex]]"> |
53 </iron-list> | 56 </settings-omnibox-extension-entry> |
54 </template> | 57 </template> |
55 </div> | 58 </iron-list> |
| 59 </template> |
56 </template> | 60 </template> |
57 <script src="search_engines_page.js"></script> | 61 <script src="search_engines_page.js"></script> |
58 </dom-module> | 62 </dom-module> |
OLD | NEW |