Skip to content

Commit

Permalink
Update progress, update, and error icons in chrome://chrome to Material
Browse files Browse the repository at this point in the history
versions.

BUG=473342, 484780

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

Cr-Commit-Position: refs/heads/master@{#328660}
  • Loading branch information
estade authored and Commit bot committed May 7, 2015
1 parent 16596c8 commit cb7c193
Show file tree
Hide file tree
Showing 11 changed files with 123 additions and 41 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 0 additions & 2 deletions chrome/app/theme/theme_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -1027,11 +1027,9 @@
<structure type="chrome_scaled_image" name="IDR_TRANSLATE" file="translate.png" />
<structure type="chrome_scaled_image" name="IDR_TRANSLATE_ACTIVE" file="translate_active.png" />
<structure type="chrome_scaled_image" name="IDR_UP_ARROW" file="common/up_arrow.png" />
<structure type="chrome_scaled_image" name="IDR_UPDATE_FAILED" file="common/update_failed.png" />
<structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_LOW" file="common/update_menu_severity_low.png" />
<structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_MEDIUM" file="common/update_menu_severity_medium.png" />
<structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_HIGH" file="common/update_menu_severity_high.png" />
<structure type="chrome_scaled_image" name="IDR_UPDATE_UPTODATE" file="common/update_uptodate.png" />
<if expr="chromeos">
<structure type="chrome_scaled_image" name="IDR_USER_IMAGE_CAPTURE" file="common/snapshot_wide.png" />
<structure type="chrome_scaled_image" name="IDR_USER_IMAGE_RECYCLE" file="common/discard_wide.png" />
Expand Down
41 changes: 15 additions & 26 deletions chrome/browser/resources/help/help_content.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,41 +62,33 @@
margin-top: 30px;
}

.help-page-icon,
.help-page-icon-large {
.help-page-icon {
background-position: center;
background-repeat: no-repeat;
display: inline-block;
margin-right: 4px;
vertical-align: top;
}

.help-page-icon {
height: 17px;
width: 17px;
}

.help-page-icon-large {
height: 22px;
width: 22px;
height: 18px;
vertical-align: middle;
width: 18px;
}

#update-status-icon.up-to-date {
background-image: url(chrome://theme/IDR_UPDATE_UPTODATE);
background-size: 17px;
background-image: url(chrome://theme/IDR_CHECKMARK);
background-size: 18px;
}

#update-status-icon.working {
background-image: url(chrome://resources/images/throbber.svg);
background-size: 16px;
}

#update-status-icon.failed {
background-image: url(chrome://theme/IDR_UPDATE_FAILED);
background-size: 17px;
background-image: url(chrome://theme/IDR_ERROR);
background-size: 18px;
}

#update-status-message-container {
display: inline-block;
vertical-align: top;
vertical-align: middle;
}

#more-info-expander {
Expand Down Expand Up @@ -126,21 +118,18 @@
margin-top: 8px;
}

#channel-change-disallowed-icon {
#channel-change-disallowed-icon,
.channel-change-error-icon {
-webkit-margin-start: 4px;
background-image: url(chrome://theme/IDR_CONTROLLED_SETTING_MANDATORY);
background-size: 17px;
vertical-align: middle;
background-size: 16px;
}

.channel-change-error-bubble {
display: flex;
}

.channel-change-error-icon {
-webkit-margin-start: 4px;
background-image: url(chrome://theme/IDR_CONTROLLED_SETTING_MANDATORY);
background-size: 22px;
.channel-change-error-bubble .channel-change-error-icon {
vertical-align: top;
}

Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/resources/help/help_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ cr.define('help', function() {
channelChangeDisallowedError.className = 'channel-change-error-bubble';

var channelChangeDisallowedIcon = document.createElement('div');
channelChangeDisallowedIcon.classList.add('help-page-icon-large');
channelChangeDisallowedIcon.classList.add('channel-change-error-icon');
channelChangeDisallowedIcon.className =
'help-page-icon channel-change-error-icon';
channelChangeDisallowedError.appendChild(channelChangeDisallowedIcon);

var channelChangeDisallowedText = document.createElement('div');
Expand Down
Binary file added ui/resources/default_100_percent/common/error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ui/resources/default_200_percent/common/error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ui/resources/ui_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@
<structure type="chrome_scaled_image" name="IDR_EASY_UNLOCK_UNLOCKED" file="common/easy_unlock_unlocked.png" />
<structure type="chrome_scaled_image" name="IDR_EASY_UNLOCK_UNLOCKED_HOVER" file="common/easy_unlock_unlocked_hover.png" />
<structure type="chrome_scaled_image" name="IDR_EASY_UNLOCK_UNLOCKED_PRESSED" file="common/easy_unlock_unlocked_pressed.png" />
<structure type="chrome_scaled_image" name="IDR_ERROR" file="common/error.png" />
<structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED" file="common/folder_closed.png" />
<structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED_RTL" file="common/folder_closed_rtl.png" />
<if expr="toolkit_views">
Expand Down
116 changes: 105 additions & 11 deletions ui/webui/resources/images/throbber.svg
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 cb7c193

Please sign in to comment.