Skip to content

Commit

Permalink
Files.app: Update cloud import badges.
Browse files Browse the repository at this point in the history
BUG=402344
TEST=manually confirmed that correct gray icons are shown as badges.

Review URL: https://codereview.chromium.org/931663005

Cr-Commit-Position: refs/heads/master@{#316745}
  • Loading branch information
fukino authored and Commit bot committed Feb 18, 2015
1 parent 186b656 commit 42a2538
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 24 deletions.
8 changes: 4 additions & 4 deletions ui/file_manager/file_manager/foreground/css/file_manager.css
Original file line number Diff line number Diff line change
Expand Up @@ -1003,14 +1003,14 @@ body.selecting .thumbnail-grid .thumbnail-item[selected] .checkmark {

.copied .badge {
background-image: -webkit-image-set(
url(../images/files/ui/copied_badge.png) 1x,
url(../images/files/ui/2x/copied_badge.png) 2x);
url(../images/files/ui/cloud_import_syncing.png) 1x,
url(../images/files/ui/2x/cloud_import_syncing.png) 2x);
}

.imported .badge {
background-image: -webkit-image-set(
url(../images/files/ui/drive_badge.png) 1x,
url(../images/files/ui/2x/drive_badge.png) 2x);
url(../images/files/ui/service_drive.png) 1x,
url(../images/files/ui/2x/service_drive.png) 2x);
height: 16px;
position: absolute;
right: 7px;
Expand Down
24 changes: 4 additions & 20 deletions ui/file_manager/file_manager/foreground/css/file_status.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,12 @@

[file-status-icon='copied'] {
background-image: -webkit-image-set(
url(../images/files/ui/copied_badge_gray.png) 1x,
url(../images/files/ui/2x/copied_badge_gray.png) 2x);
}

tree:focus .tree-item[selected] > .tree-row > [file-status-icon='copied'],
list:focus [selected] [file-status-icon='copied'],
list.autocomplete-suggestions [selected] [file-status-icon='copied'] {
background-image: -webkit-image-set(
url(../images/files/ui/copied_badge.png) 1x,
url(../images/files/ui/2x/copied_badge.png) 2x);
url(../images/files/ui/cloud_import_syncing.png) 1x,
url(../images/files/ui/2x/cloud_import_syncing.png) 2x);
}

[file-status-icon='imported'] {
background-image: -webkit-image-set(
url(../images/files/ui/drive_badge.png) 1x,
url(../images/files/ui/2x/drive_badge.png) 2x);
}

tree:focus .tree-item[selected] > .tree-row > [file-status-icon='imported'],
list:focus [selected] [file-status-icon='imported'],
list.autocomplete-suggestions [selected] [file-status-icon='imported'] {
background-image: -webkit-image-set(
url(../images/files/ui/drive_badge_white.png) 1x,
url(../images/files/ui/2x/drive_badge_white.png) 2x);
url(../images/files/ui/service_drive.png) 1x,
url(../images/files/ui/2x/service_drive.png) 2x);
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 42a2538

Please sign in to comment.