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

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

Issue 2128173002: Move settings_dropdown_menu styling to settings_shared_css. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More feedback Created 4 years, 5 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/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 {
16 /* TODO(dschuyler): share styling with settings-dropdown-menu */
17 --iron-icon-fill-color: var(--paper-grey-600);
18 }
19
20 paper-listbox div {
21 align-items: center;
22 color: var(--paper-grey-800);
23 display: flex;
24 font-size: inherit;
25 min-height: 48px;
26 padding: 0 16px;
27 }
28
29 paper-listbox div.iron-selected {
30 font-weight: bold;
31 }
32
33 paper-listbox div:focus {
34 background-color: var(--paper-grey-300);
35 outline: none;
36 }
37 </style> 15 </style>
38 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 16 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
39 section="search"> 17 section="search">
40 <neon-animatable id="main"> 18 <neon-animatable id="main">
41 <div class="settings-box first"> 19 <div class="settings-box first">
42 <p class="start">$i18n{searchExplanation}</p> 20 <p class="start">$i18n{searchExplanation}</p>
43 <paper-dropdown-menu> 21 <paper-dropdown-menu>
44 <paper-listbox class="dropdown-content" 22 <paper-listbox class="dropdown-content"
45 selected="[[getSelectedSearchEngineIndex_(searchEngines_)]]" 23 selected="[[getSelectedSearchEngineIndex_(searchEngines_)]]"
46 on-iron-select="onIronSelect_"> 24 on-iron-select="onIronSelect_">
47 <template is="dom-repeat" items="[[searchEngines_]]"> 25 <template is="dom-repeat" items="[[searchEngines_]]">
48 <!--TODO(dpapad): Use <button class="paper-item">..</button> 26 <!--TODO(dpapad): Use <button class="paper-item">..</button>
49 once it lands in paper-item-shared-styles.html--> 27 once it lands in paper-item-shared-styles.html-->
50 <div role="option">[[item.name]]</div> 28 <div class="dropdown-item" role="option">[[item.name]]</div>
51 </template> 29 </template>
52 </paper-listbox> 30 </paper-listbox>
53 </paper-dropdown-menu> 31 </paper-dropdown-menu>
54 </div> 32 </div>
55 <div class="settings-box"> 33 <div class="settings-box">
56 <paper-button on-tap="onManageSearchEnginesTap_" 34 <paper-button on-tap="onManageSearchEnginesTap_"
57 class="primary-button"> 35 class="primary-button">
58 $i18n{searchEnginesManage} 36 $i18n{searchEnginesManage}
59 </paper-button> 37 </paper-button>
60 </div> 38 </div>
61 </neon-animatable> 39 </neon-animatable>
62 <template is="dom-if" name="search-engines"> 40 <template is="dom-if" name="search-engines">
63 <settings-subpage page-title="$i18n{searchEnginesManage}"> 41 <settings-subpage page-title="$i18n{searchEnginesManage}">
64 <settings-search-engines-page></settings-search-engines-page> 42 <settings-search-engines-page></settings-search-engines-page>
65 </settings-subpage> 43 </settings-subpage>
66 </template> 44 </template>
67 </settings-animated-pages> 45 </settings-animated-pages>
68 </template> 46 </template>
69 <script src="search_page.js"></script> 47 <script src="search_page.js"></script>
70 </dom-module> 48 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698