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/neon-animation/neon-ani
matable.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap
er-dropdown-menu.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap
er-dropdown-menu.html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis
tbox.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis
tbox.html"> |
6 <link rel="import" href="/search_engines_page/search_engines_page.html"> | 6 <link rel="import" href="/search_engines_page/search_engines_page.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="/settings_page/settings_animated_pages.html"> | 8 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
9 <link rel="import" href="/settings_page/settings_subpage.html"> | 9 <link rel="import" href="/settings_page/settings_subpage.html"> |
10 <link rel="import" href="/settings_shared_css.html"> | 10 <link rel="import" href="/settings_shared_css.html"> |
11 | 11 |
12 <dom-module id="settings-search-page"> | 12 <dom-module id="settings-search-page"> |
13 <template> | 13 <template> |
14 <style include="settings-shared"> | 14 <style include="settings-shared"> |
15 paper-dropdown-menu { | 15 paper-dropdown-menu { |
16 /* TODO(dschuyler): share styling with settings-dropdown-menu */ | 16 /* TODO(dschuyler): share styling with settings-dropdown-menu */ |
17 --iron-icon-fill-color: var(--paper-grey-600); | 17 --iron-icon-fill-color: var(--paper-grey-600); |
18 } | 18 } |
19 | 19 |
20 paper-listbox div { | 20 paper-listbox div { |
21 align-items: center; | 21 align-items: center; |
| 22 color: var(--paper-grey-800); |
22 display: flex; | 23 display: flex; |
23 font-size: 16px; | 24 font-size: inherit; |
24 font-weight: 400; | |
25 line-height: 24px; | |
26 min-height: 48px; | 25 min-height: 48px; |
27 padding: 0px 16px; | 26 padding: 0 16px; |
28 } | 27 } |
29 | 28 |
30 paper-listbox div.iron-selected { | 29 paper-listbox div.iron-selected { |
31 font-weight: bold; | 30 font-weight: bold; |
32 } | 31 } |
33 | 32 |
34 paper-listbox div:focus { | 33 paper-listbox div:focus { |
| 34 background-color: var(--paper-grey-300); |
35 outline: none; | 35 outline: none; |
36 } | 36 } |
37 | |
38 paper-listbox div:hover { | |
39 background-color: var(--settings-hover-color); | |
40 } | |
41 </style> | 37 </style> |
42 <settings-animated-pages id="pages" current-route="{{currentRoute}}" | 38 <settings-animated-pages id="pages" current-route="{{currentRoute}}" |
43 section="search"> | 39 section="search"> |
44 <neon-animatable id="main"> | 40 <neon-animatable id="main"> |
45 <div class="settings-box first"> | 41 <div class="settings-box first"> |
46 <p class="start">$i18n{searchExplanation}</p> | 42 <p class="start">$i18n{searchExplanation}</p> |
47 <paper-dropdown-menu> | 43 <paper-dropdown-menu> |
48 <paper-listbox class="dropdown-content" | 44 <paper-listbox class="dropdown-content" |
49 selected="[[getSelectedSearchEngineIndex_(searchEngines_)]]" | 45 selected="[[getSelectedSearchEngineIndex_(searchEngines_)]]" |
50 on-iron-select="onIronSelect_"> | 46 on-iron-select="onIronSelect_"> |
51 <template is="dom-repeat" items="[[searchEngines_]]"> | 47 <template is="dom-repeat" items="[[searchEngines_]]"> |
52 <div>[[item.name]]</div> | 48 <!--TODO(dpapad): Use <button class="paper-item">..</button> |
| 49 once it lands in paper-item-shared-styles.html--> |
| 50 <div role="option">[[item.name]]</div> |
53 </template> | 51 </template> |
54 </paper-listbox> | 52 </paper-listbox> |
55 </paper-dropdown-menu> | 53 </paper-dropdown-menu> |
56 </div> | 54 </div> |
57 <div class="settings-box"> | 55 <div class="settings-box"> |
58 <paper-button on-tap="onManageSearchEnginesTap_" | 56 <paper-button on-tap="onManageSearchEnginesTap_" |
59 class="primary-button"> | 57 class="primary-button"> |
60 $i18n{searchEnginesManage} | 58 $i18n{searchEnginesManage} |
61 </paper-button> | 59 </paper-button> |
62 </div> | 60 </div> |
63 </neon-animatable> | 61 </neon-animatable> |
64 <template is="dom-if" name="search-engines"> | 62 <template is="dom-if" name="search-engines"> |
65 <settings-subpage page-title="$i18n{searchEnginesManage}"> | 63 <settings-subpage page-title="$i18n{searchEnginesManage}"> |
66 <settings-search-engines-page></settings-search-engines-page> | 64 <settings-search-engines-page></settings-search-engines-page> |
67 </settings-subpage> | 65 </settings-subpage> |
68 </template> | 66 </template> |
69 </settings-animated-pages> | 67 </settings-animated-pages> |
70 </template> | 68 </template> |
71 <script src="search_page.js"></script> | 69 <script src="search_page.js"></script> |
72 </dom-module> | 70 </dom-module> |
OLD | NEW |