Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Side by Side Diff: chrome/browser/resources/settings/search_engines_page/search_engines_page.html

Issue 2375493003: MD Settings: Fix rendering of popup menus inside iron-lists. (Closed)
Patch Set: Nit Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 .extension-engines { 17 .extension-engines {
18 @apply(--settings-list-frame-padding); 18 @apply(--settings-list-frame-padding);
19 } 19 }
20 20
21 settings-omnibox-extension-entry { 21 settings-omnibox-extension-entry {
22 border-top: var(--settings-separator-line); 22 border-top: var(--settings-separator-line);
23 } 23 }
24 24
25 settings-omnibox-extension-entry:first-of-type { 25 settings-omnibox-extension-entry:first-of-type {
26 border-top: none; 26 border-top: none;
27 } 27 }
28
29 #extensions-container {
30 overflow: inherit;
31 }
28 </style> 32 </style>
29 <div class="settings-box first"> 33 <div class="settings-box first">
30 <h2>$i18n{searchEnginesDefault}</h2> 34 <h2>$i18n{searchEnginesDefault}</h2>
31 </div> 35 </div>
32 <settings-search-engines-list engines="[[defaultEngines]]"> 36 <settings-search-engines-list engines="[[defaultEngines]]">
33 </settings-search-engines-list> 37 </settings-search-engines-list>
34 <template is="dom-if" if="[[showAddSearchEngineDialog_]]" restamp> 38 <template is="dom-if" if="[[showAddSearchEngineDialog_]]" restamp>
35 <settings-search-engine-dialog></settings-search-engine-dialog> 39 <settings-search-engine-dialog></settings-search-engine-dialog>
36 </template> 40 </template>
37 <div class="settings-box first"> 41 <div class="settings-box first">
38 <h2>$i18n{searchEnginesOther}</h2> 42 <h2>$i18n{searchEnginesOther}</h2>
39 </div> 43 </div>
40 <!-- TODO(dbeam): why does on-click work with keyboard but on-tap 44 <!-- TODO(dbeam): why does on-click work with keyboard but on-tap
41 doesn't? --> 45 doesn't? -->
42 <settings-search-engines-list engines="[[otherEngines]]"> 46 <settings-search-engines-list engines="[[otherEngines]]">
43 <a class="list-item list-button" is="action-link" 47 <a class="list-item list-button" is="action-link"
44 on-tap="onAddSearchEngineTap_" id="addSearchEngine"> 48 on-tap="onAddSearchEngineTap_" id="addSearchEngine">
45 $i18n{searchEnginesAddSearchEngine}</a> 49 $i18n{searchEnginesAddSearchEngine}</a>
46 </settings-search-engines-list> 50 </settings-search-engines-list>
47 51
48 <template is="dom-if" if="[[showExtensionsList_]]"> 52 <template is="dom-if" if="[[showExtensionsList_]]">
49 <div class="settings-box first"> 53 <div class="settings-box first">
50 <h2>$i18n{searchEnginesExtension}</h2> 54 <h2>$i18n{searchEnginesExtension}</h2>
51 </div> 55 </div>
52 <iron-list id="extensions" class="extension-engines" selectable 56 <div id="extensions-container">
53 items="[[extensions]]"> 57 <iron-list id="extensions" class="extension-engines" selectable
54 <template> 58 items="[[extensions]]" scroll-target="extensions-container">
55 <settings-omnibox-extension-entry engine="[[item]]" 59 <template>
56 tabindex$="[[tabIndex]]"> 60 <settings-omnibox-extension-entry engine="[[item]]"
57 </settings-omnibox-extension-entry> 61 tabindex$="[[tabIndex]]">
58 </template> 62 </settings-omnibox-extension-entry>
59 </iron-list> 63 </template>
64 </iron-list>
65 </div>
60 </template> 66 </template>
61 </template> 67 </template>
62 <script src="search_engines_page.js"></script> 68 <script src="search_engines_page.js"></script>
63 </dom-module> 69 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698