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/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/polymer/v1_0/iron-icon/iron-icon.htm l"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 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="drive_cache_dialog.html"> | 6 <link rel="import" href="drive_cache_dialog.html"> |
| 7 <link rel="import" href="../prefs/prefs.html"> | 7 <link rel="import" href="../prefs/prefs.html"> |
| 8 <link rel="import" href="../route.html"> | 8 <link rel="import" href="../route.html"> |
| 9 <link rel="import" href="../settings_shared_css.html"> | 9 <link rel="import" href="../settings_shared_css.html"> |
| 10 | 10 |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 118 } | 118 } |
| 119 | 119 |
| 120 :host-context([dir=rtl]) .end-aligned .wrapper { | 120 :host-context([dir=rtl]) .end-aligned .wrapper { |
| 121 direction: ltr; | 121 direction: ltr; |
| 122 } | 122 } |
| 123 | 123 |
| 124 .end-aligned .wrapper span { | 124 .end-aligned .wrapper span { |
| 125 direction: initial; | 125 direction: initial; |
| 126 unicode-bidi: embed; | 126 unicode-bidi: embed; |
| 127 } | 127 } |
| 128 | |
| 129 button[is='paper-icon-button-light'].delete { | |
|
fukino
2017/02/08 20:20:51
As the delete icon is used only in Chrome OS, I di
| |
| 130 background-image: url(chrome://resources/images/delete.svg); | |
| 131 } | |
| 132 | |
| 133 .delete { | |
| 134 display: none; | |
| 135 } | |
| 136 | |
| 137 [actionable] .delete { | |
| 138 display: block; | |
| 139 } | |
| 128 </style> | 140 </style> |
| 129 <div class="settings-box first" | 141 <div class="settings-box first" |
| 130 hidden$="[[!isSpaceLow_(sizeStat_.spaceState)]]"> | 142 hidden$="[[!isSpaceLow_(sizeStat_.spaceState)]]"> |
| 131 <div class="message-area"> | 143 <div class="message-area"> |
| 132 <iron-icon icon="cr:warning"></iron-icon> | 144 <iron-icon icon="cr:warning"></iron-icon> |
| 133 <div class="message"> | 145 <div class="message"> |
| 134 <div class="message-title">$i18n{storageSpaceLowMessageTitle}</div> | 146 <div class="message-title">$i18n{storageSpaceLowMessageTitle}</div> |
| 135 <div class="message-description"> | 147 <div class="message-description"> |
| 136 <span>$i18n{storageSpaceLowMessageLine1}</span> | 148 <span>$i18n{storageSpaceLowMessageLine1}</span> |
| 137 <span>$i18n{storageSpaceLowMessageLine2}</span> | 149 <span>$i18n{storageSpaceLowMessageLine2}</span> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 169 <div id="availableLabelArea" class="bar-label end-aligned"> | 181 <div id="availableLabelArea" class="bar-label end-aligned"> |
| 170 <div class="vertical-line"></div> | 182 <div class="vertical-line"></div> |
| 171 <div class="wrapper"><span>$i18n{storageItemAvailable}</span></div> | 183 <div class="wrapper"><span>$i18n{storageItemAvailable}</span></div> |
| 172 <div class="wrapper"> | 184 <div class="wrapper"> |
| 173 <span class="storage-size">[[sizeStat_.availableSize]]</span> | 185 <span class="storage-size">[[sizeStat_.availableSize]]</span> |
| 174 </div> | 186 </div> |
| 175 </div> | 187 </div> |
| 176 </div> | 188 </div> |
| 177 </div> | 189 </div> |
| 178 </div> | 190 </div> |
| 179 <div class="settings-box" on-tap="onDownloadsTap_" actionable> | 191 <div class="settings-box two-line" on-tap="onDownloadsTap_" actionable> |
| 180 <div class="start">$i18n{storageItemDownloads}</div> | 192 <div class="start"> |
| 181 <div id="downloadsSize" class="storage-size"> | 193 $i18n{storageItemDownloads} |
| 182 $i18n{storageSizeComputing} | 194 <div id="downloadsSize" class="secondary"> |
| 195 $i18n{storageSizeComputing} | |
| 196 </div> | |
| 183 </div> | 197 </div> |
| 184 <button class="icon-external" is="paper-icon-button-light"></button> | 198 <button class="icon-external" is="paper-icon-button-light"></button> |
| 185 </div> | 199 </div> |
| 186 <div class="settings-box" on-tap="onDriveCacheTap_" | 200 <div class="settings-box two-line" on-tap="onDriveCacheTap_" |
| 187 hidden$="[[!driveEnabled_]]" actionable> | 201 hidden$="[[!driveEnabled_]]" actionable$="[[hasDriveCache_]]" > |
|
Dan Beam
2017/02/13 19:47:55
maybe worth changing from
hidden$="[[!driveEnable
fukino
2017/02/13 19:50:52
Sorry! It's already templated in ToT. I'll rebase
fukino
2017/02/14 00:58:38
Rebased. (Done)
| |
| 188 <div class="start">$i18n{storageItemDriveCache}</div> | 202 <div class="start"> |
| 189 <div id="driveCacheSize" class="storage-size"> | 203 $i18n{storageItemDriveCache} |
| 190 $i18n{storageSizeComputing} | 204 <div id="driveCacheSize" class="secondary"> |
| 205 $i18n{storageSizeComputing} | |
| 206 </div> | |
| 207 </div> | |
| 208 <button class="delete" is="paper-icon-button-light"></button> | |
|
Dan Beam
2017/02/13 19:47:55
can we just use
<link rel="import" href="chrome:/
fukino
2017/02/14 00:58:38
<iron-icon icon="cr:delete"> worked. Thanks!
Done.
| |
| 209 </div> | |
| 210 <div class="settings-box two-line" on-tap="onBrowsingDataTap_" actionable> | |
| 211 <div class="start"> | |
| 212 $i18n{storageItemBrowsingData} | |
| 213 <div id="browsingDataSize" class="secondary"> | |
| 214 $i18n{storageSizeComputing} | |
| 215 </div> | |
| 191 </div> | 216 </div> |
| 192 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 217 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 193 </div> | 218 </div> |
| 194 <div class="settings-box" on-tap="onBrowsingDataTap_" actionable> | 219 <div class="settings-box two-line" on-tap="onAndroidTap_" |
| 195 <div class="start">$i18n{storageItemBrowsingData}</div> | |
| 196 <div id="browsingDataSize" class="storage-size"> | |
| 197 $i18n{storageSizeComputing} | |
| 198 </div> | |
| 199 <button class="subpage-arrow" is="paper-icon-button-light"></button> | |
| 200 </div> | |
| 201 <div class="settings-box" on-tap="onAndroidTap_" | |
| 202 hidden$="[[!androidEnabled_]]" actionable> | 220 hidden$="[[!androidEnabled_]]" actionable> |
| 203 <div class="start">$i18n{storageItemAndroid}</div> | 221 <div class="start"> |
| 204 <div id="androidSize" class="storage-size"> | 222 $i18n{storageItemAndroid} |
| 205 $i18n{storageSizeComputing} | 223 <div id="androidSize" class="secondary"> |
| 224 $i18n{storageSizeComputing} | |
| 225 </div> | |
| 206 </div> | 226 </div> |
| 207 <button class="icon-external" is="paper-icon-button-light"></button> | 227 <button class="icon-external" is="paper-icon-button-light"></button> |
| 208 </div> | 228 </div> |
| 209 <template is="dom-if" if="[[!isGuest_]]"> | 229 <template is="dom-if" if="[[!isGuest_]]"> |
| 210 <div class="settings-box" on-tap="onOtherUsersTap_" actionable> | 230 <div class="settings-box two-line" on-tap="onOtherUsersTap_" actionable> |
| 211 <div class="start">$i18n{storageItemOtherUsers}</div> | 231 <div class="start"> |
| 212 <div id="otherUsersSize" class="storage-size"> | 232 $i18n{storageItemOtherUsers} |
| 213 $i18n{storageSizeComputing} | 233 <div id="otherUsersSize" class="secondary"> |
| 234 $i18n{storageSizeComputing} | |
| 235 </div> | |
| 214 </div> | 236 </div> |
| 215 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 237 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 216 </div> | 238 </div> |
| 217 </template> | 239 </template> |
| 218 | 240 |
| 219 <settings-drive-cache-dialog id="storageDriveCache"> | 241 <settings-drive-cache-dialog id="storageDriveCache"> |
| 220 </settings-drive-cache-dialog> | 242 </settings-drive-cache-dialog> |
| 221 </template> | 243 </template> |
| 222 <script src="storage.js"></script> | 244 <script src="storage.js"></script> |
| 223 </dom-module> | 245 </dom-module> |
| OLD | NEW |