From cb7c1931b7e9f08b77eeb4f5ca89c3c4699eede6 Mon Sep 17 00:00:00 2001 From: estade Date: Wed, 6 May 2015 17:16:03 -0700 Subject: [PATCH] Update progress, update, and error icons in chrome://chrome to Material versions. BUG=473342, 484780 Review URL: https://codereview.chromium.org/1123743009 Cr-Commit-Position: refs/heads/master@{#328660} --- .../common/update_failed.png | Bin 528 -> 0 bytes .../common/update_uptodate.png | Bin 154 -> 0 bytes .../common/update_failed.png | Bin 1118 -> 0 bytes .../common/update_uptodate.png | Bin 605 -> 0 bytes chrome/app/theme/theme_resources.grd | 2 - .../browser/resources/help/help_content.css | 41 +++---- chrome/browser/resources/help/help_page.js | 4 +- .../default_100_percent/common/error.png | Bin 0 -> 237 bytes .../default_200_percent/common/error.png | Bin 0 -> 365 bytes ui/resources/ui_resources.grd | 1 + ui/webui/resources/images/throbber.svg | 116 ++++++++++++++++-- 11 files changed, 123 insertions(+), 41 deletions(-) delete mode 100644 chrome/app/theme/default_100_percent/common/update_failed.png delete mode 100644 chrome/app/theme/default_100_percent/common/update_uptodate.png delete mode 100644 chrome/app/theme/default_200_percent/common/update_failed.png delete mode 100644 chrome/app/theme/default_200_percent/common/update_uptodate.png create mode 100644 ui/resources/default_100_percent/common/error.png create mode 100644 ui/resources/default_200_percent/common/error.png diff --git a/chrome/app/theme/default_100_percent/common/update_failed.png b/chrome/app/theme/default_100_percent/common/update_failed.png deleted file mode 100644 index 3f0d5cd59d4490c119465aa4bb17d856f7a01798..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 528 zcmV+r0`L8aP)NO!qOs-iY_Mt zc2H3LLrstre(dt<<5$iNXW0w@&u;Q^zoV#pYEdb z1#SWm*xH7j3H1B0uaSY=H=4lm6+#5aBVZH2L|s8xUS(xfX@00n_o$e1+no%IoYVmT z)f7Tr01&f+vV`6Y22sFZ4)GUQ4n$1%0ZqfaV&mrwq62t(br)zxPSfgLSk%JCU z!8ob4j*2NIUvK{OCC=Va22CY-R@S#6;^9)8QN%LYnNCPaklH;qsFevGD5$Ts_hOwl zkJst;pf}h06x0L|RrNs9{GBG$lZQ@(!G1V=2!?aeY5j*#G{yYwulre&lEsTpZhe1v z{syD*(8Gm}LR3I}GFAzL!FcJy#_c2}0ibCXLd;JA$AFxFp9=V(Qaz8^%;ryZ{cSgu S=SwO80000e zYY97hvDo#A7H$9Ta49-*OL2VpRFsu-d`nN#7d?@Zi3wXdn)3c1^xslLUNjPM5g0IR8$nuC89GWC>I#Xw9f5Q?$z`S9KD&f`}5q|xoJcYRWdJn89fZtiA(^MCvPvu8wvhaoHv zNrY%zzF@EhqL9}*5$B_TmyDr5Nl?*LJRSSDNc9||bNX9x48|!xj>miwr`&YT|4vH- zUwmLV(&nSZqpU6Vq1%Gcl-Jfl8B9Es2cL#aQrI8C_5kkh^6_xQhp7X^E0RI1KJf@^ zOUIz!g)jhXiaV{oAW{eAft)~`K)(a+fVHh{*7ru-a2^CEN?gbw=8r&N0jeRIRXBKT z1X>mrx`2cIG3WPVZlo!AkUpm}(!e&Wp!LQ%e<1^4z>ud@DW+-j3b4@Q)TBg=V-G?% zVlE6DR8WA_!M{To?7=tz1X^J(`CQM#AO{0Q209^gk#1Z;awSajy@1O=(j4NMH@~HS z{0snt&F|T`a)w?6K>)_!A&Q$(1p@;{3Lwq*0$!0gms24C=s&eWoI(<-B337)9teEb zR9vvWG>Mj@6q2`S7yznB8K!z1!Ysa^rAep^(K(44RL~SZ=Rsr^U(jwTgmzP&*cufm z067Jj)fYs{b}J$Z0w_#bh4O~+ip=1SWw{l=W$DkA1{FjT4_hcrvpag}1rz{r*=t$` zsD>%8SKl@D?&w^Wse)v$35YKXuAoB0dLdMhQeRi!$_Y+V#AzN@h4NYoa!3_Krg@x; zC+QG{!Ra|etqRTUE7A;P99X~#?Ed~8-6v0HAne`!0RtEVrbdNEL-P~OmTV1l4BWoF z3dWmRF9fUag#%Qe$_|R{>*{6H(4FT%seae$SQRO&P&cMVkuuCQ?0y2zz4JBm%Vz=D zx$_MhmtN&)N56Mila%V4wHZhs1L72-$4)XH?E=tx{3J=5&jmKiCX=l08a0-NlM-+; zZD{d$2veP;Yndt)4(?Ek#*`UVn2^ZyTmTF=*U@13$1Q@UjZ~W34DDNlF+khGZ=b(` zGrp}mQO#pwu{2DtA1X|Ou!}I)yj)2aR>y!Qv1Z}wfNr6l~&Mn zMtD_B1Yz;-gw&Jz0{#Mao_>4%di#}&SJQd6FeFotg)?_V`7;SfSY)er_TtqE#C2dt zuRY2X(eB|G@I3G$@T`v8fZ@S}=%)Vx?f}04x3lr5ubU)9O9tErhQKE9D6pU)mIo6~ kL3V(@fob%707*qoM6N<$g3_)2;s5{u diff --git a/chrome/app/theme/default_200_percent/common/update_uptodate.png b/chrome/app/theme/default_200_percent/common/update_uptodate.png deleted file mode 100644 index ad8ace812b9112a43406a5f83912bdfc4060db07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 605 zcmV-j0;2tiP)F|90%}+X^?p6&_M`~;v#qnbk!il)(QzN|FkM)t=<^!SmKXq zFcLt$(*z?$%P4xTO`^a`U~DIFE%*L`hN3|{87hpSg9++%CzFi3SM2h--pA9CVr0={ zr4&`QE#B-Q$nA*3__uyM8!d~W&I{V~ - - diff --git a/chrome/browser/resources/help/help_content.css b/chrome/browser/resources/help/help_content.css index 6829fb76e06910..b43f6e8dbacfec 100644 --- a/chrome/browser/resources/help/help_content.css +++ b/chrome/browser/resources/help/help_content.css @@ -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 { @@ -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; } diff --git a/chrome/browser/resources/help/help_page.js b/chrome/browser/resources/help/help_page.js index 98e1a166e8131b..7dbc848064df80 100644 --- a/chrome/browser/resources/help/help_page.js +++ b/chrome/browser/resources/help/help_page.js @@ -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'); diff --git a/ui/resources/default_100_percent/common/error.png b/ui/resources/default_100_percent/common/error.png new file mode 100644 index 0000000000000000000000000000000000000000..9e03cacb1598309cefc23dbc65d0f7b5baa5a0b6 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheEuJopAr*{UuNZP2G7xG1m~(C3 z!Lxy`Zv)p}6SL{!XbRsj#j2X+V3S&%bNg{-@5>nvwx|5~k>2_9^-lj~+&O`dF78q~ z%HwufT+k?DhyJ}A2}_)fike=()JQg(a=6l~G~?z+naf2|I?s%z9Q@hR64JJ+AwbjF z*Wty_)d9-Rrgt2s@`y5aml;jr;fY+6a^eBQbItaP3nj$+Pe>+9PI@GFT8GQUz-o!A lM#16Lp~?NF$IXS_G2467N`lWou%(zCQ}&=kr;P>G~X&>mtbYKWz+DQJwF$DkS`UC;=>EzQF8_eO;)4wzx+;LnDT-a%%6^Y`Y`Ha1|Z00000 LNkvXXu0mjf6b+qK literal 0 HcmV?d00001 diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 17b524813fe72e..788bd56e1308d7 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -277,6 +277,7 @@ + diff --git a/ui/webui/resources/images/throbber.svg b/ui/webui/resources/images/throbber.svg index efd7990c693cf7..0cb6d53bb09908 100644 --- a/ui/webui/resources/images/throbber.svg +++ b/ui/webui/resources/images/throbber.svg @@ -1,12 +1,106 @@ - - - - + + + + Material design circular activity spinner with CSS3 animation + + + + + + + + + +