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

Side by Side Diff: chrome/browser/resources/settings/device_page/keyboard.html

Issue 2587913007: MD Settings: cr-slider: Make display consistent and clean up. (Closed)
Patch Set: Add tiny/huge labels Created 4 years 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/cr_elements/cr_slider/cr_slider.html "> 1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.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/polymer/v1_0/iron-collapse/iron-coll apse.html"> 4 <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-flex-layout/iron-f lex-layout-classes.html">
6 <link rel="import" href="/controls/settings_checkbox.html"> 5 <link rel="import" href="/controls/settings_checkbox.html">
7 <link rel="import" href="/controls/settings_dropdown_menu.html"> 6 <link rel="import" href="/controls/settings_dropdown_menu.html">
8 <link rel="import" href="/i18n_setup.html"> 7 <link rel="import" href="/i18n_setup.html">
9 <link rel="import" href="/route.html"> 8 <link rel="import" href="/route.html">
10 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="/settings_shared_css.html">
11 10
12 <dom-module id="settings-keyboard"> 11 <dom-module id="settings-keyboard">
13 <template> 12 <template>
14 <style include="settings-shared"></style> 13 <style include="settings-shared"></style>
15 <div class="settings-box first"> 14 <div class="settings-box first">
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 <div class="settings-box"> 74 <div class="settings-box">
76 <settings-checkbox 75 <settings-checkbox
77 pref="{{prefs.settings.language.xkb_auto_repeat_enabled_r2}}" 76 pref="{{prefs.settings.language.xkb_auto_repeat_enabled_r2}}"
78 label="$i18n{keyboardEnableAutoRepeat}"> 77 label="$i18n{keyboardEnableAutoRepeat}">
79 </settings-checkbox> 78 </settings-checkbox>
80 </div> 79 </div>
81 <iron-collapse 80 <iron-collapse
82 opened="[[prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"> 81 opened="[[prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]">
83 <div class="settings-box continuation settings-checkbox-spacer"> 82 <div class="settings-box continuation settings-checkbox-spacer">
84 <div class="start" id="repeatDelayLabel">$i18n{keyRepeatDelay}</div> 83 <div class="start" id="repeatDelayLabel">$i18n{keyRepeatDelay}</div>
85 <div class="layout horizontal center"> 84 <cr-slider id="delaySlider"
86 <div>$i18n{keyRepeatDelayLong}</div> 85 value="{{prefs.settings.language.xkb_auto_repeat_delay_r2.value}}"
87 <cr-slider id="delaySlider" class="always-on" snaps 86 tick-values="[[autoRepeatDelays_]]"
88 value="{{prefs.settings.language.xkb_auto_repeat_delay_r2.value}}" 87 disabled="[[
89 tick-values="[[autoRepeatDelays_]]" 88 !prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"
90 disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.va lue]]" 89 aria-labelledby="repeatDelayLabel"
91 aria-labelledby="repeatDelayLabel"> 90 label-min="$i18n{keyRepeatDelayLong}"
92 </cr-slider> 91 label-max="$i18n{keyRepeatDelayShort}">
93 <div>$i18n{keyRepeatDelayShort}</div> 92 </cr-slider>
94 </div>
95 </div> 93 </div>
96 <div class="settings-box continuation settings-checkbox-spacer"> 94 <div class="settings-box continuation settings-checkbox-spacer">
97 <div class="start" id="repeatRateLabel">$i18n{keyRepeatRate}</div> 95 <div class="start" id="repeatRateLabel">$i18n{keyRepeatRate}</div>
98 <div class="layout horizontal center"> 96 <cr-slider id="repeatRateSlider"
99 <div>$i18n{keyRepeatRateSlow}</div> 97 value="{{
100 <cr-slider id="repeatRateSlider" class="always-on" snaps 98 prefs.settings.language.xkb_auto_repeat_interval_r2.value}}"
101 value="{{prefs.settings.language.xkb_auto_repeat_interval_r2.value }}" 99 tick-values="[[autoRepeatIntervals_]]"
102 tick-values="[[autoRepeatIntervals_]]" 100 disabled="[[
103 disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.va lue]]" 101 !prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"
104 aria-labelledby="repeatRateLabel"> 102 aria-labelledby="repeatRateLabel"
105 </cr-slider> 103 label-min="$i18n{keyRepeatRateSlow}"
106 <div>$i18n{keyRepeatRateFast}</div> 104 label-max="$i18n{keyRepeatRateFast}">
107 </div> 105 </cr-slider>
108 </div> 106 </div>
109 </iron-collapse> 107 </iron-collapse>
110 <div id="keyboardOverlay" class="settings-box" 108 <div id="keyboardOverlay" class="settings-box"
111 on-tap="onShowKeyboardShortcutsOverlayTap_" actionable> 109 on-tap="onShowKeyboardShortcutsOverlayTap_" actionable>
112 $i18n{showKeyboardShortcutsOverlay} 110 $i18n{showKeyboardShortcutsOverlay}
113 </div> 111 </div>
114 <div class="settings-box" on-tap="onShowLanguageInputTap_" actionable> 112 <div class="settings-box" on-tap="onShowLanguageInputTap_" actionable>
115 $i18n{keyboardShowLanguageAndInput} 113 $i18n{keyboardShowLanguageAndInput}
116 </div> 114 </div>
117 </template> 115 </template>
118 <script src="keyboard.js"></script> 116 <script src="keyboard.js"></script>
119 </dom-module> 117 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698