From c6416d8f6d5f18e46d49a5a6edb648ba71d176a0 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 9 Sep 2019 15:39:56 -0600 Subject: [PATCH] Mail - icon cleanup - Remove png in favour of svg - Use filemanager navbar icon for filemanager related actions --- mail/inc/class.mail_compose.inc.php | 2 +- mail/templates/default/display.xet | 2 +- mail/templates/default/index.xet | 2 +- mail/templates/mobile/app.css | 2 +- mail/templates/pixelegg/app.css | 4 ++-- mail/templates/pixelegg/app.less | 2 +- .../templates/pixelegg/images/filemanager.png | Bin 3139 -> 0 bytes .../templates/pixelegg/images/filemanager.svg | 19 ------------------ mail/templates/pixelegg/images/kmmsgread.png | Bin 1717 -> 0 bytes 9 files changed, 7 insertions(+), 26 deletions(-) delete mode 100755 mail/templates/pixelegg/images/filemanager.png delete mode 100644 mail/templates/pixelegg/images/filemanager.svg delete mode 100755 mail/templates/pixelegg/images/kmmsgread.png diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index 4db6fe1c77..2a41455a3d 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -149,7 +149,7 @@ class mail_compose ), 'selectFromVFSForCompose' => array( 'caption' => 'VFS', - 'icon' => 'filemanager', + 'icon' => 'filemanager/navbar', 'group' => ++$group, 'onExecute' => 'javaScript:app.mail.compose_triggerWidget', 'hint' => 'Select file(s) from VFS', diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet index 69379665ee..54821f79cf 100644 --- a/mail/templates/default/display.xet +++ b/mail/templates/default/display.xet @@ -81,7 +81,7 @@ - + diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet index 5a83f1417b..23c5894d24 100644 --- a/mail/templates/default/index.xet +++ b/mail/templates/default/index.xet @@ -65,7 +65,7 @@ - + diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css index a8ce0c6170..78d94c735e 100644 --- a/mail/templates/mobile/app.css +++ b/mail/templates/mobile/app.css @@ -1652,7 +1652,7 @@ span.status_img { width: 12px; height: 12px; background-repeat: no-repeat; - background-image: url(../pixelegg/images/kmmsgread.png); + background-image: url(../pixelegg/images/kmmsgread.svg); background-size: 12px 12px; } tr.deleted span.status_img { diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index 04bb4f5f9e..acbae26a72 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -86,7 +86,7 @@ span.status_img { width: 12px; height: 12px; background-repeat: no-repeat; - background-image: url(../default/images/kmmsgread.png); + background-image: url(../default/images/kmmsgread.svg); } tr.deleted span.status_img { background-image: url(../default/images/kmmsgdel.png); @@ -1640,7 +1640,7 @@ span.status_img { width: 12px; height: 12px; background-repeat: no-repeat; - background-image: url(../pixelegg/images/kmmsgread.png); + background-image: url(../pixelegg/images/kmmsgread.svg); background-size: 12px 12px; } tr.deleted span.status_img { diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index e822495108..c4d47dad7a 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -734,7 +734,7 @@ span.status_img { width: 12px; height: 12px; background-repeat: no-repeat; - background-image: url(../pixelegg/images/kmmsgread.png); + background-image: url(../pixelegg/images/kmmsgread.svg); background-size: 12px 12px; } diff --git a/mail/templates/pixelegg/images/filemanager.png b/mail/templates/pixelegg/images/filemanager.png deleted file mode 100755 index fe30f9317f5738c07272be614417a038ab97a9b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3139 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 diff --git a/mail/templates/pixelegg/images/filemanager.svg b/mail/templates/pixelegg/images/filemanager.svg deleted file mode 100644 index c4e1251a72..0000000000 --- a/mail/templates/pixelegg/images/filemanager.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - diff --git a/mail/templates/pixelegg/images/kmmsgread.png b/mail/templates/pixelegg/images/kmmsgread.png deleted file mode 100755 index 651f6d2e477b9d0cba506898ee482f77ee58bb9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1717 zcmbVNX;2eq7+w%9AlMjM2GGhHpp`<7&Als!NfwaNfCPkiR1KR20!cP(77|lNEr>u7 zv7i;jqO=1Y>M>XcdmthTT6L_o$_zzCDxgrRXa%bXwHprY562(f+1>B^-hH3vy=RM7 z#6-Ef`nUoB;2ymcRnaSGf1GF0Z?nxdOfTM4gqn&cQYedt!~vO>NXEfvgC-SM;TrA6 z%nNu30L)0!C8#O2ayfz#29CzA!?7AnG#UUx!mTC^mVr}XGM=h4hO&kln^~Yv8_G%& zDS1kh0#DN|wUKzdEhYi8Wni$D6&?nLSP`1QfKwXKYS0_ah&7Zo!Hdv)yO_%YCse46 zP}ZbVYUK)0L6A5o;t1Fn4}w6km;(t#Vlfm9@_7)S%cE~G8xkTSF~XOCQx}W2Mru+!{ZtZ_P8dr&6Em%<;H8Z%?TS# zI9G+6i7XPM>yhF&4W@JVWM^))ZFzf3n7;JWS0}?V&7jG&9|=%j6cl@OD((Le`<%dYV*3fgs%GF!TS{QAWb+r z^UrXPqE_D@{CkxcD52Km&bwLF=bvQk)@!^ez>8a$F=S&X9p5Uk$K1I#!`+~#|1LBV3Gx;dF2;+ z9qtBHJ-r&V9fujJe^IRdW=_FVqqZl=@)nKfQh0qARL`^f0xy}|Exq|aP@J~Q{g zE#tj512byu;8?-s^eZz~GFA1B&;T{6GTg0E6^&R!=H2 zv=#JnbL~BI!qZ8$KDqL8ip8&bF6sSf<=So1*^k=fO6RLPCBIg@U@b%xjtSz*rt6E# zbHaT8ewOnc33c4dZX79pc=N@~0>2ZhkDMEpGhFkfTbKAKM%_MREIfUrqdy+ Ur$)TjZ2yr&N5r5<