Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/html/icon.html"> | 3 <link rel="import" href="chrome://resources/html/icon.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 7 <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-checkbox/paper-ch eckbox.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.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/cr_elements/cr_dialog/cr_dialog.html "> | 10 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 56 } | 56 } |
| 57 | 57 |
| 58 iron-icon[icon='settings:sync-problem'] { | 58 iron-icon[icon='settings:sync-problem'] { |
| 59 --iron-icon-fill-color: var(--settings-error-color); | 59 --iron-icon-fill-color: var(--settings-error-color); |
| 60 } | 60 } |
| 61 | 61 |
| 62 .settings-box .sync-error { | 62 .settings-box .sync-error { |
| 63 color: var(--settings-error-color); | 63 color: var(--settings-error-color); |
| 64 } | 64 } |
| 65 | 65 |
| 66 .settings-box.three-line { | |
| 67 min-height: 100px; | |
| 68 } | |
| 69 | |
| 66 .icon-container { | 70 .icon-container { |
| 67 display: flex; | 71 display: flex; |
| 68 flex-shrink: 0; | 72 flex-shrink: 0; |
| 69 justify-content: center; | 73 justify-content: center; |
| 70 width: 40px; | 74 width: 40px; |
| 71 } | 75 } |
| 72 | 76 |
| 73 #googleg-logo { | 77 #googleg-logo { |
| 74 background-image: url(../../../../../ui/webui/resources/images/200-logo_ googleg.png); | 78 background-image: url(../../../../../ui/webui/resources/images/200-logo_ googleg.png); |
| 75 background-size: cover; | 79 background-size: cover; |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 198 <div>$i18n{lockScreenTitle}</div> | 202 <div>$i18n{lockScreenTitle}</div> |
| 199 <div class="secondary"> | 203 <div class="secondary"> |
| 200 [[getPasswordState_(hasPin, | 204 [[getPasswordState_(hasPin, |
| 201 prefs.settings.enable_screen_lock.value)]] | 205 prefs.settings.enable_screen_lock.value)]] |
| 202 </div> | 206 </div> |
| 203 </div> | 207 </div> |
| 204 </div> | 208 </div> |
| 205 </template> | 209 </template> |
| 206 | 210 |
| 207 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 211 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
| 208 <div class="settings-box"> | 212 <div class$="settings-box [[getEasyUnlockClass_( |
| 209 <div class="middle"> | 213 easyUnlockEnabled_, easyUnlockProximityDetectionAllowed_)]]"> |
|
stevenjb
2016/11/04 22:52:08
This is kind of awkward. We definitely shouldn't b
Moe
2016/11/06 21:43:14
Done.
| |
| 214 <div class="start"> | |
| 210 <div>$i18n{easyUnlockSectionTitle}</div> | 215 <div>$i18n{easyUnlockSectionTitle}</div> |
| 211 <div class="secondary"> | 216 <div class="secondary"> |
| 212 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | 217 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> |
| 213 $i18n{easyUnlockSetupIntro} | 218 $i18n{easyUnlockSetupIntro} |
| 214 </template> | 219 </template> |
| 215 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 220 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 216 $i18n{easyUnlockDescription} | 221 $i18n{easyUnlockDescription} |
| 217 </template> | 222 </template> |
| 218 <a target="_blank" href$="$i18n{easyUnlockLearnMoreURL}"> | 223 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> |
| 219 $i18n{learnMore} | 224 $i18n{learnMore} |
| 220 </a> | 225 </a> |
| 221 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 226 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 222 <template is="dom-if" | 227 <template is="dom-if" |
| 223 if="[[easyUnlockProximityDetectionAllowed_]]"> | 228 if="[[easyUnlockProximityDetectionAllowed_]]"> |
| 224 <settings-checkbox | 229 <settings-checkbox |
| 225 pref="{{prefs.easy_unlock.proximity_required}}" | 230 pref="{{prefs.easy_unlock.proximity_required}}" |
| 226 label="$i18n{easyUnlockRequireProximityLabel}"> | 231 label="$i18n{easyUnlockRequireProximityLabel}"> |
| 227 </settings-checkbox> | 232 </settings-checkbox> |
| 228 </template> | 233 </template> |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 346 | 351 |
| 347 <if expr="chromeos"> | 352 <if expr="chromeos"> |
| 348 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 353 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 349 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 354 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 350 </easy-unlock-turn-off-dialog> | 355 </easy-unlock-turn-off-dialog> |
| 351 </template> | 356 </template> |
| 352 </if> | 357 </if> |
| 353 </template> | 358 </template> |
| 354 <script src="people_page.js"></script> | 359 <script src="people_page.js"></script> |
| 355 </dom-module> | 360 </dom-module> |
| OLD | NEW |