From d8d34e7afc472570899a12b44dc5ce1576d04b03 Mon Sep 17 00:00:00 2001 From: lilia Date: Fri, 1 Apr 2016 11:03:26 -0700 Subject: [PATCH] Icon upgrade Also remove unused images. // FREEBIE --- images/arrow_drop_down.png | Bin 94 -> 0 bytes images/audio.png | Bin 449 -> 0 bytes images/audio.svg | 1 + images/back.png | Bin 125 -> 0 bytes images/back.svg | 1 + images/back_white.png | Bin 116 -> 0 bytes images/check-black.png | Bin 140 -> 0 bytes images/check-white.png | Bin 144 -> 0 bytes images/check.png | Bin 128 -> 0 bytes images/check.svg | 1 + images/default.png | Bin 5217 -> 0 bytes images/double-check-black.png | Bin 184 -> 0 bytes images/double-check-white.png | Bin 197 -> 0 bytes images/double-check.svg | 1 + images/icon_tile.png | Bin 1135 -> 0 bytes images/menu.png | Bin 112 -> 0 bytes images/menu.svg | 4 ++ images/menu_black.png | Bin 108 -> 0 bytes images/pencil.png | Bin 160 -> 0 bytes images/refresh.png | Bin 299 -> 0 bytes images/video.png | Bin 247 -> 0 bytes images/video.svg | 1 + images/x.png | Bin 264 -> 0 bytes images/x.svg | 1 + js/notifications.js | 2 +- js/views/file_input_view.js | 4 +- stylesheets/_conversation.scss | 14 +------ stylesheets/_global.scss | 17 +++------ stylesheets/_index.scss | 20 +--------- stylesheets/_variables.scss | 18 +++++++++ stylesheets/manifest.css | 68 +++++++++++++++++---------------- 31 files changed, 74 insertions(+), 79 deletions(-) delete mode 100644 images/arrow_drop_down.png delete mode 100644 images/audio.png create mode 100644 images/audio.svg delete mode 100644 images/back.png create mode 100644 images/back.svg delete mode 100644 images/back_white.png delete mode 100644 images/check-black.png delete mode 100644 images/check-white.png delete mode 100644 images/check.png create mode 100644 images/check.svg delete mode 100644 images/default.png delete mode 100644 images/double-check-black.png delete mode 100644 images/double-check-white.png create mode 100644 images/double-check.svg delete mode 100644 images/icon_tile.png delete mode 100644 images/menu.png create mode 100644 images/menu.svg delete mode 100644 images/menu_black.png delete mode 100644 images/pencil.png delete mode 100644 images/refresh.png delete mode 100644 images/video.png create mode 100644 images/video.svg delete mode 100644 images/x.png create mode 100644 images/x.svg diff --git a/images/arrow_drop_down.png b/images/arrow_drop_down.png deleted file mode 100644 index 4b1be1c43b43628f20c2ecc0ca0b6d3b08731485..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1RZkbkkP60RiG>LwCI)}pn|YUH rW-6SW#&${On!}{{h60PmKn8~8dJ=ChHi}*XYGCkm^>bP0l+XkK?wc9J diff --git a/images/audio.png b/images/audio.png deleted file mode 100644 index d29eeb7d810ab5d0f20f3de7df7019c08dec810d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 449 zcmV;y0Y3hTP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00B8kL_t(Y$75g^1=Iz%89Eu1sbSE6ApFCyfI)&h?F}df zf#6#Pe{ziZ4`=H!%x3rvHtHWkKIz8%M-kCsxBzumI;qC|M-$~_*bEl^&0s~EG5;}S z*ckSM#cwjOlVZ$&EV5z@ufZ|}q!@!RXgz}yfOcgqW=N|50uTy@C+>H zf-SM(g2-xS!g;-5ejm98{b7)X@;t!&Bjg(NpCJv(lL7NykZ({AJd{AZUxUD)RO)!` z7lR~}=Sf*$Pl5CL!TetG669$HE_i->0hV(nCyT6M;DfWXz%maQm?+D%62MXtB$G>7 zF~Y%c7%YAr=s^k!Hg1OP(D*Z>q^LDuxC}Kunf$_EpJ6^Q(}E273k+;3R7bCXiIL(8 r@;9(b5~H-Hy~)tZpfK8UAr}Au;r1}y`#^)400000NkvXXu0mjfTTHR{ diff --git a/images/audio.svg b/images/audio.svg new file mode 100644 index 000000000..9f81966e0 --- /dev/null +++ b/images/audio.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/back.png b/images/back.png deleted file mode 100644 index 22b624b31f2a72ecb5a5c1493ebf0bc7563b6807..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*17f%<*kP60R2iC<7j2xap{}?z@ zJp=#Ee`vtW&pTCK(f4N{TU=6XJ;RDW?9C<}o?X1hB`VrGr&aS9Em7sG{3P^HgMq;@ XQ}*l?dFh`(^B6o`{an^LB{Ts5c{L-V diff --git a/images/back.svg b/images/back.svg new file mode 100644 index 000000000..4449fbd71 --- /dev/null +++ b/images/back.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/back_white.png b/images/back_white.png deleted file mode 100644 index 4d7869d26f59e9104ff46a6b9778da2660594811..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Yfl%)5R22v2@TxU(&b& zDQABF|6k8&r`nUC%KKyL8CCz2^%wtF|9^dG>Y0OCr|N(H=l{3=-}-iU&WM>z5i<|| tzgcmYDePN!L-E2>QXK6Y4=m`&Vvv&c&N-+tM+RsGgQu&X%Q~loCIB+#ttr57iP(&yMOzaz b \ No newline at end of file diff --git a/images/default.png b/images/default.png deleted file mode 100644 index cdf0bb9f815b84d07965747a31424d15d750a364..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5217 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 Of;2IYR6iOEZ?Ln;`rp4!dp7|6hILHO$H zm_^@aIxJdn@fS}r3-gOJ3Cw$EI3%%Eb@H{gMBh18z5QZGuzdZJ%(V_@y{yCg-nnhe z*`xC*b=Ij*r!RFpP5TttR>lK|2MYQZk=Xf#aG=xr!aWB`njxgN@xNAu@Fmr diff --git a/images/double-check-white.png b/images/double-check-white.png deleted file mode 100644 index f5c9ba3f50e9b3ca2184e64fa756f0e47a3e5f2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmV;$06PDPP)YH z7&73$(EtAb96*}sf5(40TuRRU|Nh?`sAS>)|NnDvD{+G=sUcH|AW+G-|E_3C{+s>Z z{a*k`i~QgFU;jVH{|y*QfRgV2fBZlFU*Ny|{|Eoy{MQHj2-Bkf9#CZpU}Z))+yYmo z`2XSmKRBEVR`&kC4Uh&YtHB+{{7_n8z@r-g6+VY3d^VWr00000NkvXXu0mjf^8Q;< diff --git a/images/double-check.svg b/images/double-check.svg new file mode 100644 index 000000000..37adae6a3 --- /dev/null +++ b/images/double-check.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/icon_tile.png b/images/icon_tile.png deleted file mode 100644 index 4710e2a73133f9012cd6e0e201b5ef162a00b290..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1135 zcmV-#1d#iQP)VGd000McNliru-v}H49XdQ?5)uFa1N=!u zK~!ko?U~zh+eQ#XPcHxha%9Qz|Nmef^58Nhl347HA7(*Nj$#2MXe$o4in`q?EfE4QKqZ4@9#$zkz$%EQ zf~FFOSVB%e0f-s2wWurDN67AW3}`EHS3?zEkAKf25fkhN=(9mK_R$@4w-HYV!v2#$AJF0LcMhw^wr9uR_-;CvTon{(<$JQCoz`j(lRe?y}xUxALf1DA+v%*aN zZ1ZBq$5ykQ^(K&P@Szb+Q0X6>mDqDnTOB1C*}T8Z0W-^_DnKkeH^IC3)#SMR4uF_o zQ_U+R;mz1psp~d@x+0DuTl|i+AW44ANU?Z7Or1KwRgtK$GUm-wZ?hsGy!B8sI1G~z zyeb{9M8ti&LXM1~_0WlYT3)UV;55v%LXPm=L&mabc3luTkBP6@z2wc%%B5M2ahmM9 zq?mbyw9Nh4=yd(WjalJ|`O+!{tk?`hQm$`S$ z0ultf!DuR{JP4kmv5l9rAbG?6Qb3Hdem5+e-RmXQWEUqfH|CBI_nYN&iHgzN9`?gD zHg~nyCtKWm!;*`~5%=Rp)8Fi0JpBXtF?#&(ow18Pvt#hkmTG9r!?s@P#UUHX#9b|( zixJ;r*$r-R9XJ}6@#H-uXTVN+Qx(L=jlXX{*jeg&@j58TFMDjobDTg}={MWnrt++l zy;k`$8X4s4)hz#c+Z!=+_K0xSf-akTR`R{pE{c6}aXD6K!I0roSENL?7h6NUqWbmv+_uU&n~|}P5MAU2{o0Se zF8X|AOy(ed`MC&)-T{D%bL7398;~228<77AkZ%_I0Ky9{%O3y$002ovPDHLkV1mc9 B6fpn* diff --git a/images/menu.png b/images/menu.png deleted file mode 100644 index 017e45edec435f227c0fadfa13a4a27353acafd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1b59q?5R22v2@=a5)L;02{eS%5 z@9J@fU;kJ5AT(P>xJ=eVCD820|N5W*kJjJ67$C*FG*QAUgq7iWp7Wo)^m*JsBN#kg L{an^LB{Ts5on9xv diff --git a/images/menu.svg b/images/menu.svg new file mode 100644 index 000000000..c696d4c8e --- /dev/null +++ b/images/menu.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/menu_black.png b/images/menu_black.png deleted file mode 100644 index 0e4f2f6ea0564fe9d6ebdb4bea0df48aced9de0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1V^0^ykP60RiERoU4^0niv(+!U z$~^Ty`=RMavMX4xeQ2uS{l}xKw&+${6o zc#5UgjfG8?g)9b3IOaK+ZePjZ_qKfYae3(oPRl=yvsP5SM2GG$rsh6 zMNd}k{yVQ?;_V}i=US6@3GLf|`nFNrWWDK=Pgj0m)0|tso;$cJM>=9x638tKp00i_ I>zopr03PT%=>Px# diff --git a/images/refresh.png b/images/refresh.png deleted file mode 100644 index 94ca8a1b4dda92911188b4383ee704999d888652..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6kP1-;uxZFe(NP$ze5EQ><|7ky%ptoXvV_+Re^`?lC+5r@8tAV8BJF{Tr75Yv>>(W z21l;ph6(q7*uDQy$MUf1P;7us;0l=&rYR@AqpT9oo~UCUNZqw_B;m%^TG=6VvUv<~}p3zV^ew_;csf pcJK7gp4y*Z(;tR@zZd@@zwc#m#nr9CDxlzC@O1TaS?83{1OTneaYX|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?S)};onm%b<7o#f@K_EIQWr>E6) z$?a0WlsoZ~bA95auL{23f9oZSit@K|qf7mJ=T1||U#@!Mb|&*DO9w`-fQE+O=5Ar9 o@4rrRTsdDkf3{Osblp0+9P_dZMv4*&K&u%%UHx3vIVCg!0CKTT;{X5v diff --git a/images/video.svg b/images/video.svg new file mode 100644 index 000000000..3bd918961 --- /dev/null +++ b/images/video.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/x.png b/images/x.png deleted file mode 100644 index 41a77702b8d30e56207d421498a035635fd9f325..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1&H|4}Ak8fd!i)^F=73bNmw5WR zvft-n72{OUpBk$L6k6`-;uvCa`st*Nyv+szuJ;8+Qu(UbJdP@SIrC8SMW!+9NvV*V z%rApf1aHWwyD#eYe!c&H?R|FkxsNoI{g&y*s@pH(!2Bo}|=eer2!zNBe| zN25ZBr?H;Wl#}Y<8IieTnWCl-HKbLh* G2~7aEsbVDn diff --git a/images/x.svg b/images/x.svg new file mode 100644 index 000000000..40b5e39d6 --- /dev/null +++ b/images/x.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/js/notifications.js b/js/notifications.js index 985a0f529..b62110c71 100644 --- a/js/notifications.js +++ b/js/notifications.js @@ -78,7 +78,7 @@ }.bind(this)), buttons : [{ title : 'Mark all as read', - iconUrl : 'images/check.png' + iconUrl : 'images/check.svg' }] }); } else { diff --git a/js/views/file_input_view.js b/js/views/file_input_view.js index b8fa45ef2..a886ea2c9 100644 --- a/js/views/file_input_view.js +++ b/js/views/file_input_view.js @@ -119,8 +119,8 @@ var type = file.type.split('/')[0]; switch (type) { - case 'audio': this.addThumb('/images/audio.png'); break; - case 'video': this.addThumb('/images/video.png'); break; + case 'audio': this.addThumb('/images/audio.svg'); break; + case 'video': this.addThumb('/images/video.svg'); break; case 'image': this.oUrl = URL.createObjectURL(file); this.addThumb(this.oUrl); diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss index 8b52acc87..146e4745d 100644 --- a/stylesheets/_conversation.scss +++ b/stylesheets/_conversation.scss @@ -146,16 +146,6 @@ span { vertical-align: middle; } - - &:before { - content: ''; - display: inline-block; - vertical-align: middle; - width: 18px; - height: 18px; - background: url('/images/refresh.png') no-repeat center center; - background-size: 100%; - } } } @@ -332,11 +322,11 @@ } .sent .status { display: inline-block; - background: url('/images/check-black.png') center; + @include color-svg('/images/check.svg', black); } .delivered .status { display: inline-block; - background: url('/images/double-check-black.png') center; + @include color-svg('/images/double-check.svg', black); } .pending .status { display: inline-block; diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss index a044c91b9..9e7b881e5 100644 --- a/stylesheets/_global.scss +++ b/stylesheets/_global.scss @@ -61,10 +61,11 @@ button { cursor: pointer; } a { color: $blue; } .inactive button.back { - background: url('/images/back.png') no-repeat center center; + @include header-icon-black('/images/back.svg'); + } button.back { - background: url('/images/back_white.png') no-repeat center center; + @include header-icon-white('/images/back.svg'); } ::-webkit-scrollbar { @@ -96,7 +97,7 @@ button.back { } .inactive .menu .hamburger { - background: url('/images/menu_black.png') no-repeat center; + @include header-icon-black('/images/menu.svg'); } .menu { @@ -106,12 +107,8 @@ button.back { .hamburger { width: $button-height; height: $button-height; - background: url('/images/menu.png') no-repeat center; vertical-align: middle; - - &:hover { - background-color: rgba(0,0,0, 0.2); - } + @include header-icon-white('/images/menu.svg'); } .menu-list { display: none; @@ -260,10 +257,6 @@ $avatar-size: 44px; } } -.conversation-header .check { - float: right; - background: url('/images/check.png') no-repeat center center; -} .conversation-list-item { cursor: pointer; &:hover { diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss index 251235600..f64effd8c 100644 --- a/stylesheets/_index.scss +++ b/stylesheets/_index.scss @@ -100,7 +100,7 @@ input.search { display: block; width: 16px; height: 16px; - background: url('/images/x.png') no-repeat center; + background: url('/images/x.svg') no-repeat center; background-size: cover; } @@ -109,24 +109,6 @@ input.search { } } -.tool-bar { - button.show-new-conversation { - float: right; - height: $button-height; - width: $button-height; - border: 0; - outline: 0; - font: 300 36px $roboto; - color: white; - background: url('/images/pencil.png') no-repeat center center; - - &:hover { - background-color: darken($grey_l, 3%); - } - } - -} - .last-timestamp { font-size: smaller; float: right; diff --git a/stylesheets/_variables.scss b/stylesheets/_variables.scss index cda15a99d..a7855036a 100644 --- a/stylesheets/_variables.scss +++ b/stylesheets/_variables.scss @@ -38,3 +38,21 @@ $unread-badge-size: 21px; $loading-height: 16px; $big-avatar-min-width: 900px; + +@mixin color-svg($svg, $color) { + -webkit-mask: url($svg) no-repeat center; + -webkit-mask-size: 100%; + background-color: $color; +} +@mixin header-icon-white($svg) { + @include color-svg($svg, rgba(255,255,255, 0.8)); + &:hover { + @include color-svg($svg, white); + } +} +@mixin header-icon-black($svg) { + @include color-svg($svg, rgba(0,0,0, 0.5)); + &:hover { + @include color-svg($svg, black); + } +} diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css index 1d0f669e1..2306a51d7 100644 --- a/stylesheets/manifest.css +++ b/stylesheets/manifest.css @@ -67,10 +67,22 @@ a { color: #2090ea; } .inactive button.back { - background: url("/images/back.png") no-repeat center center; } + -webkit-mask: url("/images/back.svg") no-repeat center; + -webkit-mask-size: 100%; + background-color: rgba(0, 0, 0, 0.5); } + .inactive button.back:hover { + -webkit-mask: url("/images/back.svg") no-repeat center; + -webkit-mask-size: 100%; + background-color: black; } button.back { - background: url("/images/back_white.png") no-repeat center center; } + -webkit-mask: url("/images/back.svg") no-repeat center; + -webkit-mask-size: 100%; + background-color: rgba(255, 255, 255, 0.8); } + button.back:hover { + -webkit-mask: url("/images/back.svg") no-repeat center; + -webkit-mask-size: 100%; + background-color: white; } ::-webkit-scrollbar { width: 10px; } @@ -91,7 +103,13 @@ button.back { display: table-cell; } .inactive .menu .hamburger { - background: url("/images/menu_black.png") no-repeat center; } + -webkit-mask: url("/images/menu.svg") no-repeat center; + -webkit-mask-size: 100%; + background-color: rgba(0, 0, 0, 0.5); } + .inactive .menu .hamburger:hover { + -webkit-mask: url("/images/menu.svg") no-repeat center; + -webkit-mask-size: 100%; + background-color: black; } .menu { position: relative; @@ -99,10 +117,14 @@ button.back { .menu .hamburger { width: 36px; height: 36px; - background: url("/images/menu.png") no-repeat center; - vertical-align: middle; } + vertical-align: middle; + -webkit-mask: url("/images/menu.svg") no-repeat center; + -webkit-mask-size: 100%; + background-color: rgba(255, 255, 255, 0.8); } .menu .hamburger:hover { - background-color: rgba(0, 0, 0, 0.2); } + -webkit-mask: url("/images/menu.svg") no-repeat center; + -webkit-mask-size: 100%; + background-color: white; } .menu .menu-list { display: none; position: absolute; @@ -217,10 +239,6 @@ img.emoji { .new-group-update .members .contact .number { display: none; } -.conversation-header .check { - float: right; - background: url("/images/check.png") no-repeat center center; } - .conversation-list-item { cursor: pointer; } .conversation-list-item:hover { @@ -511,23 +529,11 @@ input.search { display: block; width: 16px; height: 16px; - background: url("/images/x.png") no-repeat center; + background: url("/images/x.svg") no-repeat center; background-size: cover; } input.search::-webkit-search-cancel-button:hover { cursor: pointer; } -.tool-bar button.show-new-conversation { - float: right; - height: 36px; - width: 36px; - border: 0; - outline: 0; - font: 300 36px Roboto, "Helvetica Neue", Arial, Helvetica, sans-serif; - color: white; - background: url("/images/pencil.png") no-repeat center center; } - .tool-bar button.show-new-conversation:hover { - background-color: #ebebeb; } - .last-timestamp { font-size: smaller; float: right; @@ -732,14 +738,6 @@ input.search { font-weight: bold; } .message-detail .info button span { vertical-align: middle; } - .message-detail .info button:before { - content: ''; - display: inline-block; - vertical-align: middle; - width: 18px; - height: 18px; - background: url("/images/refresh.png") no-repeat center center; - background-size: 100%; } .message-detail .contacts .contact-detail { padding: 0 36px; margin-bottom: 5px; } @@ -886,11 +884,15 @@ input.search { .message-container .sent .status, .message-list .sent .status { display: inline-block; - background: url("/images/check-black.png") center; } + -webkit-mask: url("/images/check.svg") no-repeat center; + -webkit-mask-size: 100%; + background-color: black; } .message-container .delivered .status, .message-list .delivered .status { display: inline-block; - background: url("/images/double-check-black.png") center; } + -webkit-mask: url("/images/double-check.svg") no-repeat center; + -webkit-mask-size: 100%; + background-color: black; } .message-container .pending .status, .message-list .pending .status { display: inline-block;