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

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

Issue 2915753003: [Night Light] CL5: Schedule Settings (Closed)
Patch Set: Steven's comments 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="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 24 matching lines...) Expand all
48 -webkit-padding-start: 0 50 -webkit-padding-start: 0
49 } 51 }
50 52
51 paper-tab { 53 paper-tab {
52 text-transform: uppercase; 54 text-transform: uppercase;
53 } 55 }
54 56
55 #controlsDiv > .settings-box:first-of-type { 57 #controlsDiv > .settings-box:first-of-type {
56 border-top: none; 58 border-top: none;
57 } 59 }
60
61 #nightLightSlider {
62 margin-top: 20px;
63 }
58 </style> 64 </style>
59 <div class="settings-box first layout vertical self-stretch"> 65 <div class="settings-box first layout vertical self-stretch">
60 <h2 class="layout self-start"> 66 <h2 class="layout self-start">
61 $i18n{displayArrangementTitle} 67 $i18n{displayArrangementTitle}
62 </h2> 68 </h2>
63 <div class="secondary layout self-start" 69 <div class="secondary layout self-start"
64 hidden="[[!hasMultipleDisplays_(displays)]]"> 70 hidden="[[!hasMultipleDisplays_(displays)]]">
65 $i18n{displayArrangementText} 71 $i18n{displayArrangementText}
66 </div> 72 </div>
67 <display-layout id="displayLayout" 73 <display-layout id="displayLayout"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 <div class="start textarea" id="colorTemperatureLabel"> 227 <div class="start textarea" id="colorTemperatureLabel">
222 $i18n{displayNightLightTemperatureLabel} 228 $i18n{displayNightLightTemperatureLabel}
223 </div> 229 </div>
224 <settings-slider id="colorTemperatureSlider" 230 <settings-slider id="colorTemperatureSlider"
225 aria-labelledby="colorTemperatureLabel" min="0" max="100" 231 aria-labelledby="colorTemperatureLabel" min="0" max="100"
226 scale="100" label-min="$i18n{displayNightLightTempSliderMinLabel}" 232 scale="100" label-min="$i18n{displayNightLightTempSliderMinLabel}"
227 label-max="$i18n{displayNightLightTempSliderMaxLabel}" 233 label-max="$i18n{displayNightLightTempSliderMaxLabel}"
228 pref="{{prefs.ash.night_light.color_temperature}}"> 234 pref="{{prefs.ash.night_light.color_temperature}}">
229 </settings-slider> 235 </settings-slider>
230 </div> 236 </div>
237 <!-- Schedule settings -->
238 <div class="settings-box embedded">
239 <div id="nightLightScheduleLabel" class="start textarea">
240 $i18n{displayNightLightScheduleLabel}
241 </div>
242 <settings-dropdown-menu
243 id="nightLightScheduleTypeDropDown"
244 aria-labelledby="nightLightScheduleLabel"
245 pref="{{prefs.ash.night_light.schedule_type}}"
246 menu-options="[[scheduleTypesList_]]">
247 </settings-dropdown-menu>
248 </div>
249 <!-- Custom schedule slider -->
250 <div class="settings-box embedded continuation">
251 <iron-collapse id="nightLightCustomScheduleCollapse"
252 class="start textarea layout vertical"
253 opened="[[shouldOpenCustomScheduleCollapse_]]">
254 <div class="settings-box embedded continuation">
255 <night-light-slider id="nightLightSlider" prefs="{{prefs}}">
256 </night-light-slider>
257 </div>
258 </iron-collapse>
259 </div>
231 </div> 260 </div>
232 </template> 261 </template>
233 262
234 </template> 263 </template>
235 <script src="display.js"></script> 264 <script src="display.js"></script>
236 </dom-module> 265 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698