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

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

Issue 2915753003: [Night Light] CL5: Schedule Settings (Closed)
Patch Set: Ready for review Created 3 years, 6 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 2
3 <link rel="import" href="chrome://resources/html/assert.html"> 3 <link rel="import" href="chrome://resources/html/assert.html">
4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> 4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
6 <link rel="import" href="chrome://resources/html/md_select_css.html"> 6 <link rel="import" href="chrome://resources/html/md_select_css.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h tml"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h tml">
11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
12 <link rel="import" href="display_layout.html"> 12 <link rel="import" href="display_layout.html">
13 <link rel="import" href="display_overscan_dialog.html"> 13 <link rel="import" href="display_overscan_dialog.html">
14 <link rel="import" href="../controls/night_light_slider.html">
15 <link rel="import" href="../controls/settings_dropdown_menu.html">
14 <link rel="import" href="../controls/settings_slider.html"> 16 <link rel="import" href="../controls/settings_slider.html">
15 <link rel="import" href="../prefs/prefs_behavior.html"> 17 <link rel="import" href="../prefs/prefs_behavior.html">
16 <link rel="import" href="../settings_shared_css.html"> 18 <link rel="import" href="../settings_shared_css.html">
17 <link rel="import" href="../settings_vars_css.html"> 19 <link rel="import" href="../settings_vars_css.html">
18 20
19 <dom-module id="settings-display"> 21 <dom-module id="settings-display">
20 <template> 22 <template>
21 <style include="settings-shared md-select iron-flex iron-flex-alignment"> 23 <style include="settings-shared md-select iron-flex iron-flex-alignment">
22 .settings-box.embedded { 24 .settings-box.embedded {
23 -webkit-margin-start: 20px; 25 -webkit-margin-start: 20px;
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 <div class="start textarea" id="colorTemperatureLabel"> 223 <div class="start textarea" id="colorTemperatureLabel">
222 $i18n{displayNightLightTemperatureLabel} 224 $i18n{displayNightLightTemperatureLabel}
223 </div> 225 </div>
224 <settings-slider id="colorTemperatureSlider" 226 <settings-slider id="colorTemperatureSlider"
225 aria-labelledby="colorTemperatureLabel" min="0" max="100" 227 aria-labelledby="colorTemperatureLabel" min="0" max="100"
226 scale="100" label-min="$i18n{displayNightLightTempSliderMinLabel}" 228 scale="100" label-min="$i18n{displayNightLightTempSliderMinLabel}"
227 label-max="$i18n{displayNightLightTempSliderMaxLabel}" 229 label-max="$i18n{displayNightLightTempSliderMaxLabel}"
228 pref="{{prefs.ash.night_light.color_temperature}}"> 230 pref="{{prefs.ash.night_light.color_temperature}}">
229 </settings-slider> 231 </settings-slider>
230 </div> 232 </div>
233 <!-- Schedule settings -->
234 <div class="settings-box embedded">
235 <div id="nightLightScheduleLabel" class="start textarea">
236 $i18n{displayNightLightScheduleLabel}
237 </div>
238 <settings-dropdown-menu
239 id="nightLightScheduleTypeDropDown"
240 lable="$i18n{displayNightLightScheduleLabel}"
241 aria-labelledby="nightLightScheduleLabel"
242 pref="{{prefs.ash.night_light.schedule_type}}"
243 menu-options="[[scheduleTypesList_]]">
244 </settings-dropdown-menu>
245 </div>
246 <!-- Custom schedule slider -->
247 <div class="settings-box embedded continuation">
248 <iron-collapse id="nightLightCustomScheduleCollapse"
249 class="start textarea layout vertical"
250 opened="[[shouldOpenCustomScheduleCollapse_]]">
251 <div class="settings-box embedded continuation">
252 <night-light-slider prefs="{{prefs}}"></night-light-slider>
253 </div>
254 </iron-collapse>
255 </div>
231 </div> 256 </div>
232 </template> 257 </template>
233 258
234 </template> 259 </template>
235 <script src="display.js"></script> 260 <script src="display.js"></script>
236 </dom-module> 261 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698