Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> |
| 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/html/icon.html"> | 5 <link rel="import" href="chrome://resources/html/icon.html"> |
| 6 <link rel="import" href="chrome://resources/html/polymer.html"> | 6 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 .footer .settings-box { | 92 .footer .settings-box { |
| 93 --settings-box-row-padding: 0; | 93 --settings-box-row-padding: 0; |
| 94 } | 94 } |
| 95 | 95 |
| 96 .delete-profile-warning { | 96 .delete-profile-warning { |
| 97 /* In order to line up with the checkbox text. */ | 97 /* In order to line up with the checkbox text. */ |
| 98 -webkit-padding-start: 36px; | 98 -webkit-padding-start: 36px; |
| 99 padding-bottom: 10px; | 99 padding-bottom: 10px; |
| 100 padding-top: 10px; | 100 padding-top: 10px; |
| 101 } | 101 } |
| 102 | |
| 103 /** | |
| 104 * By default, flexbox children have min-width calculated to be the width | |
| 105 * of the content. However, in some cases we might want to allow the | |
| 106 * width to be smaller than the content (i.e. for long text to ellipsis). | |
| 107 * In such cases this class should be applied. | |
| 108 * (See: https://bugzilla.mozilla.org/show_bug.cgi?id=1108514#c5) | |
| 109 */ | |
| 110 .no-min-width { | |
| 111 min-width: 0; | |
|
hcarmona
2017/01/19 01:53:31
Can we use "overflow: hidden" here instead?
It mak
scottchen
2017/01/19 21:32:59
using overflow: hidden will cut-off the paper-icon
| |
| 112 } | |
| 102 </style> | 113 </style> |
| 103 <settings-animated-pages id="pages" section="people"> | 114 <settings-animated-pages id="pages" section="people"> |
| 104 <neon-animatable route-path="default"> | 115 <neon-animatable route-path="default"> |
| 105 <div id="picture-subpage-trigger" class="settings-box first two-line"> | 116 <div id="picture-subpage-trigger" class="settings-box first two-line"> |
| 106 <template is="dom-if" if="[[syncStatus]]"> | 117 <template is="dom-if" if="[[syncStatus]]"> |
| 107 <div id="profile-icon" on-tap="onPictureTap_" actionable | 118 <div id="profile-icon" on-tap="onPictureTap_" actionable |
| 108 style="background-image: [[getIconImageset_(profileIconUrl_)]]"> | 119 style="background-image: [[getIconImageset_(profileIconUrl_)]]"> |
| 109 </div> | 120 </div> |
| 110 <if expr="not chromeos"> | 121 <if expr="not chromeos"> |
| 111 <div class="middle two-line text-elide" on-tap="onProfileNameTap_" | 122 <div class="middle two-line no-min-width" |
| 123 on-tap="onProfileNameTap_" actionable> | |
| 124 </if> | |
| 125 <if expr="chromeos"> | |
| 126 <div class="middle two-line no-min-width" on-tap="onPictureTap_" | |
| 112 actionable> | 127 actionable> |
| 113 </if> | 128 </if> |
| 114 <if expr="chromeos"> | 129 <div class="flex text-elide"> |
| 115 <div class="middle two-line text-elide" on-tap="onPictureTap_" | |
| 116 actionable> | |
| 117 </if> | |
| 118 <div class="flex"> | |
| 119 <span id="profile-name">[[profileName_]]</span> | 130 <span id="profile-name">[[profileName_]]</span> |
| 120 <div class="secondary" hidden="[[!syncStatus.signedIn]]"> | 131 <div class="secondary" hidden="[[!syncStatus.signedIn]]"> |
| 121 [[syncStatus.signedInUsername]] | 132 [[syncStatus.signedInUsername]] |
| 122 </div> | 133 </div> |
| 123 </div> | 134 </div> |
| 124 <button class="subpage-arrow" is="paper-icon-button-light"> | 135 <button class="subpage-arrow" is="paper-icon-button-light"> |
| 125 </button> | 136 </button> |
| 126 </div> | 137 </div> |
| 127 <if expr="not chromeos"> | 138 <if expr="not chromeos"> |
| 128 <template is="dom-if" if="[[showSignin_(syncStatus)]]"> | 139 <template is="dom-if" if="[[showSignin_(syncStatus)]]"> |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 391 <if expr="chromeos"> | 402 <if expr="chromeos"> |
| 392 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 403 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> |
| 393 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 404 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
| 394 on-close="onEasyUnlockTurnOffDialogClose_"> | 405 on-close="onEasyUnlockTurnOffDialogClose_"> |
| 395 </easy-unlock-turn-off-dialog> | 406 </easy-unlock-turn-off-dialog> |
| 396 </template> | 407 </template> |
| 397 </if> | 408 </if> |
| 398 </template> | 409 </template> |
| 399 <script src="people_page.js"></script> | 410 <script src="people_page.js"></script> |
| 400 </dom-module> | 411 </dom-module> |
| OLD | NEW |