Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/cr.html"> | 1 <link rel="import" href="chrome://resources/html/cr.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/html/web_ui_listener_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> |
| 7 <link rel="import" href="../controls/settings_dropdown_menu.html"> | 7 <link rel="import" href="../controls/settings_dropdown_menu.html"> |
| 8 <link rel="import" href="../controls/settings_toggle_button.html"> | 8 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 9 <link rel="import" href="../i18n_setup.html"> | 9 <link rel="import" href="../i18n_setup.html"> |
| 10 <link rel="import" href="../prefs/prefs_behavior.html"> | 10 <link rel="import" href="../prefs/prefs_behavior.html"> |
| 11 <link rel="import" href="../prefs/prefs_types.html"> | 11 <link rel="import" href="../prefs/prefs_types.html"> |
| 12 <link rel="import" href="../settings_shared_css.html"> | 12 <link rel="import" href="../settings_shared_css.html"> |
| 13 | 13 |
| 14 <dom-module id="settings-date-time-page"> | 14 <dom-module id="settings-date-time-page"> |
| 15 <template> | 15 <template> |
| 16 <style include="settings-shared"> | 16 <style include="settings-shared"> |
| 17 .embedded { | |
| 18 -webkit-padding-start: calc( | |
| 19 var(--settings-box-row-padding) + var(--settings-indent-width)); | |
|
michaelpg
2017/02/17 22:22:12
we have this calc in a few other places, is it wor
stevenjb
2017/02/18 19:54:06
list-frame messes with the top/bottom padding, but
| |
| 20 } | |
| 21 | |
| 17 settings-dropdown-menu { | 22 settings-dropdown-menu { |
| 18 --md-select-width: 400px; | 23 --md-select-width: 400px; |
| 19 } | 24 } |
| 20 | 25 |
| 21 paper-toggle-button, | 26 paper-toggle-button, |
| 22 cr-policy-pref-indicator { | 27 cr-policy-pref-indicator { |
| 23 -webkit-margin-start: var(--checkbox-spacing); | 28 -webkit-margin-start: var(--checkbox-spacing); |
| 24 } | 29 } |
| 25 </style> | 30 </style> |
| 26 <div class="settings-box first"> | 31 <div class="settings-box first"> |
| 27 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}" | |
| 28 menu-options="[[timeZoneList_]]" | |
| 29 disabled="[[timeZoneAutoDetect_]]"> | |
| 30 </settings-dropdown-menu> | |
| 31 </div> | |
| 32 <div class="settings-box continuation"> | |
| 33 <div class="start">$i18n{timeZoneGeolocation}</div> | 32 <div class="start">$i18n{timeZoneGeolocation}</div> |
| 34 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]" restamp> | 33 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]" restamp> |
| 35 <cr-policy-pref-indicator pref="[[fakeTimeZonePolicyPref_]]"> | 34 <cr-policy-pref-indicator pref="[[fakeTimeZonePolicyPref_]]"> |
| 36 </cr-policy-pref-indicator> | 35 </cr-policy-pref-indicator> |
| 37 </template> | 36 </template> |
| 38 <paper-toggle-button | 37 <paper-toggle-button |
| 39 id="timeZoneAutoDetect" | 38 id="timeZoneAutoDetect" |
| 40 checked="[[timeZoneAutoDetect_]]" | 39 checked="[[timeZoneAutoDetect_]]" |
| 41 disabled="[[hasTimeZoneAutoDetectPolicy_]]" | 40 disabled="[[hasTimeZoneAutoDetectPolicy_]]" |
| 42 on-change="onTimeZoneAutoDetectChange_"> | 41 on-change="onTimeZoneAutoDetectChange_"> |
| 43 </paper-toggle-button> | 42 </paper-toggle-button> |
| 44 </div> | 43 </div> |
| 45 <div class="settings-box continuation"> | 44 <div class="settings-box continuation embedded"> |
| 45 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}" | |
| 46 menu-options="[[timeZoneList_]]" | |
| 47 disabled="[[timeZoneAutoDetect_]]"> | |
| 48 </settings-dropdown-menu> | |
| 49 </div> | |
| 50 <div class="settings-box"> | |
| 46 <settings-toggle-button class="start" | 51 <settings-toggle-button class="start" |
| 47 pref="{{prefs.settings.clock.use_24hour_clock}}" | 52 pref="{{prefs.settings.clock.use_24hour_clock}}" |
| 48 label="$i18n{use24HourClock}"> | 53 label="$i18n{use24HourClock}"> |
| 49 </settings-toggle-button> | 54 </settings-toggle-button> |
| 50 </div> | 55 </div> |
| 51 <div class="settings-box" id="setDateTime" actionable | 56 <div class="settings-box" id="setDateTime" actionable |
| 52 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]"> | 57 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]"> |
| 53 <div class="start">$i18n{setDateTime}</div> | 58 <div class="start">$i18n{setDateTime}</div> |
| 54 <button class="subpage-arrow" is="paper-icon-button-light" | 59 <button class="subpage-arrow" is="paper-icon-button-light" |
| 55 aria-label="$i18n{setDateTime}"></button> | 60 aria-label="$i18n{setDateTime}"></button> |
| 56 </div> | 61 </div> |
| 57 </template> | 62 </template> |
| 58 <script src="date_time_page.js"></script> | 63 <script src="date_time_page.js"></script> |
| 59 </dom-module> | 64 </dom-module> |
| OLD | NEW |