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

Side by Side Diff: chrome/browser/resources/settings/controls/settings_dropdown_menu.html

Issue 2728683004: [MD settings] controlled by extension icon on default font size (Closed)
Patch Set: closure Created 3 years, 9 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/md_select_css.html"> 1 <link rel="import" href="chrome://resources/html/md_select_css.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_be havior.html">
4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
3 <link rel="import" href="pref_control_behavior.html"> 5 <link rel="import" href="pref_control_behavior.html">
4 <link rel="import" href="../i18n_setup.html"> 6 <link rel="import" href="../i18n_setup.html">
5 <link rel="import" href="../prefs/pref_util.html"> 7 <link rel="import" href="../prefs/pref_util.html">
6 <link rel="import" href="../settings_shared_css.html"> 8 <link rel="import" href="../settings_shared_css.html">
7 <link rel="import" href="../settings_vars_css.html"> 9 <link rel="import" href="../settings_vars_css.html">
8 10
9 <dom-module id="settings-dropdown-menu"> 11 <dom-module id="settings-dropdown-menu">
10 <template> 12 <template>
11 <style include="settings-shared md-select"> 13 <style include="settings-shared md-select">
14 :host {
15 display: inline-flex;
16 }
17
18 cr-policy-pref-indicator,
19 select {
20 -webkit-margin-start: var(--checkbox-spacing);
dschuyler 2017/03/02 19:31:37 It could be argued that --checkbox-spacing should
tommycli 2017/03/03 21:26:27 Sounds good, in followup CL sounds good.
21 }
22
12 /* Hide "Custom" value when unselectable. */ 23 /* Hide "Custom" value when unselectable. */
13 option:disabled { 24 option:disabled {
14 display: none; 25 display: none;
15 } 26 }
16 </style> 27 </style>
28 <template is="dom-if" if="[[pref.controlledBy]]" restamp>
29 <cr-policy-pref-indicator pref="[[pref]]"></cr-policy-pref-indicator>
30 </template>
17 <div class="md-select-wrapper"> 31 <div class="md-select-wrapper">
18 <select class="md-select" id="dropdownMenu" on-change="onChange_" 32 <select class="md-select" id="dropdownMenu" on-change="onChange_"
19 disabled="[[shouldDisableMenu_(disabled, menuOptions)]]"> 33 disabled="[[shouldDisableMenu_(disabled, menuOptions, pref.*)]]">
20 <template is="dom-repeat" items="[[menuOptions]]"> 34 <template is="dom-repeat" items="[[menuOptions]]">
21 <option value="[[item.value]]">[[item.name]]</option> 35 <option value="[[item.value]]">[[item.name]]</option>
22 </template> 36 </template>
23 <option value="[[notFoundValue_]]" 37 <option value="[[notFoundValue_]]"
24 disabled="[[!showNotFoundValue_(menuOptions, pref.value)]]"> 38 disabled="[[!showNotFoundValue_(menuOptions, pref.value)]]">
25 $i18n{custom} 39 $i18n{custom}
26 </option> 40 </option>
27 </select> 41 </select>
28 <span class="md-select-underline"></span> 42 <span class="md-select-underline"></span>
29 </div> 43 </div>
30 </template> 44 </template>
31 <script src="settings_dropdown_menu.js"></script> 45 <script src="settings_dropdown_menu.js"></script>
32 </dom-module> 46 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698