From 9515a317913a73ede537a3d39f89094ed8d9a02c Mon Sep 17 00:00:00 2001 From: milan Date: Tue, 12 Nov 2024 10:50:51 +0100 Subject: [PATCH] cleaned up bi icon .svg s to use there parent size and work like bootstrap font icons --- api/js/etemplate/Et2Image/Et2Image.ts | 3 + .../default/images/bi-filetype-ics.svg | 40 +------------ .../default/images/bi-filetype-odg.svg | 44 +------------- .../default/images/bi-filetype-odp.svg | 51 ++-------------- .../default/images/bi-filetype-ods.svg | 47 ++------------- .../default/images/bi-filetype-odt.svg | 47 +++------------ .../default/images/bi-filetype-vcs.svg | 47 ++------------- .../default/images/bi-filetype-webm.svg | 60 ++++--------------- api/templates/default/images/bi-save-new.svg | 39 ++---------- api/templates/default/images/bi-save.svg | 34 +---------- .../templates/default/images/bi-linkpaste.svg | 17 ++---- 11 files changed, 51 insertions(+), 378 deletions(-) diff --git a/api/js/etemplate/Et2Image/Et2Image.ts b/api/js/etemplate/Et2Image/Et2Image.ts index 602acc6f33..83cd7ae636 100644 --- a/api/js/etemplate/Et2Image/Et2Image.ts +++ b/api/js/etemplate/Et2Image/Et2Image.ts @@ -184,6 +184,9 @@ export class Et2Image extends Et2Widget(LitElement) implements et2_IDetachedDOM } // our own svg images + // We have svg images prefixed "bi-". These are used like bootstrap font icons. + // We inline them to be able to control there color etc. directly via css + //only call unsafeHtml when we are inside /egroupware/ const ourSvg = url.startsWith(this.egw().webserverUrl + '/') //checks if source is trusted if (ourSvg && url.match(/\/bi-.*\.svg/)) diff --git a/api/templates/default/images/bi-filetype-ics.svg b/api/templates/default/images/bi-filetype-ics.svg index 0e243a5b89..f83a79c89e 100644 --- a/api/templates/default/images/bi-filetype-ics.svg +++ b/api/templates/default/images/bi-filetype-ics.svg @@ -1,48 +1,13 @@ - - - + /> - diff --git a/api/templates/default/images/bi-filetype-odg.svg b/api/templates/default/images/bi-filetype-odg.svg index 36ddb27a25..8bcb8bee22 100644 --- a/api/templates/default/images/bi-filetype-odg.svg +++ b/api/templates/default/images/bi-filetype-odg.svg @@ -1,57 +1,19 @@ - - + d="M 14,4.5 V 14 c 0,1.104569 -0.895431,2 -2,2 H 11.174123 V 15 H 12 c 0.552285,0 1,-0.447715 1,-1 V 4.5 H 11 C 10.171573,4.5 9.5,3.8284271 9.5,3 V 1 H 4 C 3.4477153,1 3,1.4477153 3,2 v 9 H 2 V 2 C 2,0.8954305 2.8954305,0 4,0 H 9.5 Z M 2.622,13.666 v 0.522 c 0,0.256 -0.039,0.469667 -0.117,0.641 -0.066327,0.158232 -0.1784662,0.293008 -0.322,0.387 -0.1421255,0.08436 -0.3047359,0.127952 -0.47,0.126 C 1.5477359,15.344 1.3851255,15.30036 1.243,15.216 1.100765,15.121524 0.98947577,14.987282 0.923,14.83 0.8388828,14.626728 0.79899899,14.407878 0.806,14.188 v -0.522 c 0,-0.257333 0.039,-0.471 0.117,-0.641 0.0663093,-0.157649 0.1776133,-0.292257 0.32,-0.387 0.1411764,-0.0869 0.3042426,-0.131658 0.47,-0.129 0.1766667,0 0.3333333,0.04333 0.47,0.13 0.1433802,0.09373 0.2555042,0.228136 0.322,0.386 0.078,0.17 0.117,0.383667 0.117,0.641 m 0.803,0.519 V 13.672 C 3.425,13.295333 3.3566667,12.971333 3.22,12.7 3.0913212,12.435337 2.8856654,12.215739 2.63,12.07 2.3766667,11.923333 2.0713333,11.85 1.714,11.85 1.358,11.85 1.0513333,11.92333 0.794,12.07 0.53836597,12.214103 0.33285994,12.432867 0.205,12.697 0.06833333,12.967667 0,13.292667 0,13.672 v 0.513 c 0,0.375333 0.06833333,0.699667 0.205,0.973 0.13666667,0.270667 0.333,0.479667 0.589,0.627 0.2573333,0.144 0.564,0.216 0.92,0.216 0.3573333,0 0.663,-0.072 0.917,-0.216 0.2544636,-0.14559 0.4595821,-0.363942 0.589,-0.627 0.136,-0.273333 0.2043333,-0.597667 0.205,-0.973" /> - + /> - diff --git a/api/templates/default/images/bi-filetype-odp.svg b/api/templates/default/images/bi-filetype-odp.svg index 1a3e0d0fee..88d02a4d65 100644 --- a/api/templates/default/images/bi-filetype-odp.svg +++ b/api/templates/default/images/bi-filetype-odp.svg @@ -1,57 +1,16 @@ - - + d="M 14,4.5 V 14 c 0,1.104569 -0.895431,2 -2,2 H 10.6711 V 15 H 12 c 0.552285,0 1,-0.447715 1,-1 V 4.5 H 11 C 10.171573,4.5 9.5,3.8284271 9.5,3 V 1 H 4 C 3.4477153,1 3,1.4477153 3,2 v 9 H 2 V 2 C 2,0.8954305 2.8954305,0 4,0 H 9.5 Z M 2.622,13.666 v 0.522 c 0,0.256 -0.039,0.469667 -0.117,0.641 -0.066327,0.158232 -0.1784662,0.293008 -0.322,0.387 -0.1421255,0.08436 -0.3047359,0.127952 -0.47,0.126 C 1.5477359,15.344 1.3851255,15.30036 1.243,15.216 1.100765,15.121524 0.98947577,14.987282 0.923,14.83 0.8388828,14.626728 0.79899899,14.407878 0.806,14.188 v -0.522 c 0,-0.257333 0.039,-0.471 0.117,-0.641 0.0663093,-0.157649 0.1776133,-0.292257 0.32,-0.387 0.1411764,-0.0869 0.3042426,-0.131658 0.47,-0.129 0.1766667,0 0.3333333,0.04333 0.47,0.13 0.1433802,0.09373 0.2555042,0.228136 0.322,0.386 0.078,0.17 0.117,0.383667 0.117,0.641 m 0.803,0.519 V 13.672 C 3.425,13.295333 3.3566667,12.971333 3.22,12.7 3.0913212,12.435337 2.8856654,12.215739 2.63,12.07 2.3766667,11.923333 2.0713333,11.85 1.714,11.85 1.358,11.85 1.0513333,11.92333 0.794,12.07 0.53836597,12.214103 0.33285994,12.432867 0.205,12.697 0.06833333,12.967667 0,13.292667 0,13.672 v 0.513 c 0,0.375333 0.06833333,0.699667 0.205,0.973 0.13666667,0.270667 0.333,0.479667 0.589,0.627 0.2573333,0.144 0.564,0.216 0.92,0.216 0.3573333,0 0.663,-0.072 0.917,-0.216 0.2544636,-0.14559 0.4595821,-0.363942 0.589,-0.627 0.136,-0.273333 0.2043333,-0.597667 0.205,-0.973"/> - + d="m 3.8645707,11.936883 v 4 h 1.459 c 0.402,0 0.735,-0.07933 0.999,-0.238 0.2671559,-0.159837 0.4757748,-0.401414 0.595,-0.689 0.1306667,-0.3 0.196,-0.661333 0.196,-1.084 0,-0.42 -0.065333,-0.778333 -0.196,-1.075 -0.1183258,-0.284277 -0.325251,-0.522767 -0.59,-0.68 -0.2633333,-0.156 -0.598,-0.234 -1.004,-0.234 z m 0.791,0.645 h 0.563 c 0.2473333,0 0.4503333,0.05067 0.609,0.152 0.1645244,0.108493 0.2888897,0.26799 0.354,0.454 0.078667,0.201333 0.118,0.452333 0.118,0.753 0.0031,0.199447 -0.019758,0.39845 -0.068,0.592 -0.034495,0.153033 -0.101323,0.296919 -0.196,0.422 -0.087007,0.112142 -0.202283,0.199117 -0.334,0.252 -0.1543481,0.0577 -0.3182581,0.08553 -0.483,0.082 h -0.564 v -2.708 z" /> + - + /> diff --git a/api/templates/default/images/bi-filetype-ods.svg b/api/templates/default/images/bi-filetype-ods.svg index d56ded086d..fd94adcbfe 100644 --- a/api/templates/default/images/bi-filetype-ods.svg +++ b/api/templates/default/images/bi-filetype-ods.svg @@ -1,57 +1,18 @@ - - + /> - + d="m 3.8645707,11.936883 v 4 h 1.459 c 0.402,0 0.735,-0.07933 0.999,-0.238 0.2671559,-0.159837 0.4757748,-0.401414 0.595,-0.689 0.1306667,-0.3 0.196,-0.661333 0.196,-1.084 0,-0.42 -0.065333,-0.778333 -0.196,-1.075 -0.1183258,-0.284277 -0.325251,-0.522767 -0.59,-0.68 -0.2633333,-0.156 -0.598,-0.234 -1.004,-0.234 z m 0.791,0.645 h 0.563 c 0.2473333,0 0.4503333,0.05067 0.609,0.152 0.1645244,0.108493 0.2888897,0.26799 0.354,0.454 0.078667,0.201333 0.118,0.452333 0.118,0.753 0.0031,0.199447 -0.019758,0.39845 -0.068,0.592 -0.034495,0.153033 -0.101323,0.296919 -0.196,0.422 -0.087007,0.112142 -0.202283,0.199117 -0.334,0.252 -0.1543481,0.0577 -0.3182581,0.08553 -0.483,0.082 h -0.564 v -2.708 z"/> - + /> diff --git a/api/templates/default/images/bi-filetype-odt.svg b/api/templates/default/images/bi-filetype-odt.svg index 6ae03a1716..18ddb22a76 100644 --- a/api/templates/default/images/bi-filetype-odt.svg +++ b/api/templates/default/images/bi-filetype-odt.svg @@ -1,54 +1,21 @@ - - + /> + /> - - + + - + /> diff --git a/api/templates/default/images/bi-filetype-vcs.svg b/api/templates/default/images/bi-filetype-vcs.svg index 9d96ef2b46..8f1fe01eb2 100644 --- a/api/templates/default/images/bi-filetype-vcs.svg +++ b/api/templates/default/images/bi-filetype-vcs.svg @@ -1,55 +1,16 @@ - - - + d="M 14,4.5 V 14 c 0,1.104569 -0.895431,2 -2,2 l -1.677146,0.01935 v -1 L 12,15 c 0.552248,-0.0064 1,-0.447715 1,-1 V 4.5 H 11 C 10.171573,4.5 9.5,3.8284271 9.5,3 V 1 H 4 C 3.4477153,1 3,1.4477153 3,2 l 0.019347,6.8331318 h -1 L 2,2 C 1.9968726,0.89543493 2.8954305,0 4,0 h 5.5 z"/> + d="m 2.8476421,12.986699 a 1.1318021,1.0068525 0 1 0 0,-2.013705 1.1318021,1.0068525 0 0 0 0,2.013705 M 5.1112455,11.728133 A 0.28295043,0.25171302 0 0 1 5.3941959,11.47642 h 2.2636033 a 0.28295044,0.25171304 0 0 1 0,0.503426 H 5.3941959 A 0.28295043,0.25171302 0 0 1 5.1112455,11.728133 m 0,1.258566 a 0.28295043,0.25171302 0 0 1 0.2829504,-0.251714 h 2.2636033 a 0.28295096,0.2517135 0 0 1 0,0.503427 H 5.3941959 A 0.28295043,0.25171302 0 0 1 5.1112455,12.986699 m 0.5659008,1.258565 a 0.28295043,0.25171302 0 0 1 0.2829504,-0.251713 h 1.6977025 a 0.28295044,0.25171304 0 0 1 0,0.503426 H 5.9600967 A 0.28295043,0.25171302 0 0 1 5.6771463,14.245264"/> - + d="M 1.1499395,9.9661422 A 1.1318017,1.0068521 0 0 0 0.01813785,10.972994 v 4.027409 A 1.1318017,1.0068521 0 0 0 1.1499395,16.007255 H 7.9407496 A 1.1318017,1.0068521 0 0 0 9.0725513,15.000403 V 10.972994 A 1.1318017,1.0068521 0 0 0 7.9407496,9.9661422 Z M 0.58403874,10.972994 A 0.56590084,0.50342604 0 0 1 1.1499395,10.469568 h 6.7908101 a 0.56590084,0.50342604 0 0 1 0.5659013,0.503426 v 4.027409 A 0.56590084,0.50342604 0 0 1 7.9407496,15.503829 H 5.0886094 q 0.022636,-0.123339 0.022636,-0.251713 c 0,-0.973122 -1.0129625,-1.761991 -2.2636034,-1.761991 -1.1804692,0 -2.15042325,0.703789 -2.25454895,1.601398 a 0.56590084,0.50342604 0 0 1 -0.009054,-0.09112 z"/> diff --git a/api/templates/default/images/bi-filetype-webm.svg b/api/templates/default/images/bi-filetype-webm.svg index 3ae935804b..09fcc209a7 100644 --- a/api/templates/default/images/bi-filetype-webm.svg +++ b/api/templates/default/images/bi-filetype-webm.svg @@ -1,68 +1,28 @@ - - - - + + - - - - - - - + diff --git a/api/templates/default/images/bi-save-new.svg b/api/templates/default/images/bi-save-new.svg index 72e328508a..8e7402947d 100644 --- a/api/templates/default/images/bi-save-new.svg +++ b/api/templates/default/images/bi-save-new.svg @@ -1,41 +1,14 @@ + + +/> + diff --git a/api/templates/default/images/bi-save.svg b/api/templates/default/images/bi-save.svg index 1aa64a4a4d..561be31b66 100644 --- a/api/templates/default/images/bi-save.svg +++ b/api/templates/default/images/bi-save.svg @@ -1,38 +1,8 @@ diff --git a/filemanager/templates/default/images/bi-linkpaste.svg b/filemanager/templates/default/images/bi-linkpaste.svg index 1dd2ba8865..cbe0aa683b 100644 --- a/filemanager/templates/default/images/bi-linkpaste.svg +++ b/filemanager/templates/default/images/bi-linkpaste.svg @@ -1,28 +1,21 @@ - + /> + /> + /> + /> \ No newline at end of file