From 235f9e5e2981abb64ecf4b6318917eac0c85ee4a Mon Sep 17 00:00:00 2001 From: codecalm Date: Sun, 17 Apr 2022 21:53:39 +0200 Subject: [PATCH] fix "off" icons --- _import.sh | 2 ++ gulpfile.js | 5 +++-- src/_icons/anchor-off.svg | 2 -- src/_icons/api-off.svg | 2 -- src/_icons/atom-off.svg | 2 -- src/_icons/award-off.svg | 2 -- src/_icons/badge-off.svg | 2 -- src/_icons/badges-off.svg | 2 -- src/_icons/ballon-off.svg | 2 -- src/_icons/barrel-off.svg | 2 -- src/_icons/bath-off.svg | 2 -- src/_icons/bed-off.svg | 2 -- src/_icons/beer-off.svg | 2 -- src/_icons/box-off.svg | 2 -- src/_icons/bucket-off.svg | 2 -- src/_icons/cake-off.svg | 2 -- src/_icons/cash-off.svg | 2 -- src/_icons/coffee-off.svg | 2 -- src/_icons/container-off.svg | 2 -- src/_icons/cpu-off.svg | 2 -- src/_icons/crane-off.svg | 2 -- src/_icons/creative-commons-off.svg | 2 -- src/_icons/cross-off.svg | 2 -- src/_icons/crutches-off.svg | 2 -- src/_icons/cup-off.svg | 2 -- src/_icons/current-location-off.svg | 2 -- src/_icons/cursor-off.svg | 2 -- src/_icons/dental-off.svg | 2 -- src/_icons/device-nintendo-off.svg | 2 -- src/_icons/device-speaker-off.svg | 2 -- src/_icons/devices-pc-off.svg | 2 -- src/_icons/dialpad-off.svg | 2 -- src/_icons/diamond-off.svg | 2 -- src/_icons/directions-off.svg | 2 -- src/_icons/disabled-off.svg | 2 -- src/_icons/disc-off.svg | 2 -- src/_icons/dna-2-off.svg | 2 -- src/_icons/dna-off.svg | 2 -- src/_icons/door-off.svg | 2 -- src/_icons/download-off.svg | 2 -- src/_icons/edit-circle-off.svg | 2 -- src/_icons/edit-off.svg | 2 -- src/_icons/egg-off.svg | 2 -- src/_icons/engine-off.svg | 2 -- src/_icons/error-404-off.svg | 2 -- src/_icons/exchange-off.svg | 2 -- src/_icons/exclamation-mark-off.svg | 2 -- src/_icons/external-link-off.svg | 2 -- src/_icons/eyeglass-off.svg | 2 -- src/_icons/face-mask-off.svg | 2 -- src/_icons/feather-off.svg | 2 -- src/_icons/fence-off.svg | 2 -- src/_icons/fingerprint-off.svg | 2 -- src/_icons/fish-off.svg | 2 -- src/_icons/flag-2-off.svg | 2 -- src/_icons/flag-off.svg | 2 -- src/_icons/flame-off.svg | 2 -- src/_icons/flask-2-off.svg | 2 -- src/_icons/flask-off.svg | 2 -- src/_icons/flower-off.svg | 2 -- 60 files changed, 5 insertions(+), 118 deletions(-) diff --git a/_import.sh b/_import.sh index 3be4ac8da..6b7c12473 100755 --- a/_import.sh +++ b/_import.sh @@ -21,7 +21,9 @@ do sed -i "" 's/xmlns="http:\/\/www.w3.org\/2000\/svg"//g' ${file} sed -i "" 's/"//g' ${file} sed -i "" 's///g' ${file} + sed -i "" 's///g' ${file} sed -i "" 's///g' ${file} + sed -i "" 's///g' ${file} done svgo -f ./new/ --pretty --disable mergePaths diff --git a/gulpfile.js b/gulpfile.js index 5cb1bf57b..4a07d75d6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -54,7 +54,7 @@ if (fs.existsSync('./compile-options.json')) { } }) } - + if (typeof tempOptions.excludeIcons !== "undefined") { if (!Array.isArray(tempOptions.excludeIcons)) { throw "property excludeIcons is not an array" @@ -509,6 +509,7 @@ gulp.task('optimize', function (cb) { svgFileContent = svgFileContent .replace(/><\/(polyline|line|rect|circle|path)>/g, '/>') .replace(/rx="([^"]+)"\s+ry="\1"/g, 'rx="$1"') + .replace(/]+)?\/>/g, '') .replace(/\s?\/>/g, ' />') .replace(/\n\s*<(line|circle|path|polyline|rect)/g, "\n <$1") .replace(/polyline points="([0-9.]+)\s([0-9.]+)\s([0-9.]+)\s([0-9.]+)"/g, 'line x1="$1" y1="$2" x2="$3" y2="$4"') @@ -519,7 +520,7 @@ gulp.task('optimize', function (cb) { }) .replace(/d="m/g, 'd="M') .replace(/([Aa])\s?([0-9.]+)\s([0-9.]+)\s([0-9.]+)\s?([0-1])\s?([0-1])\s?(-?[0-9.]+)\s?(-?[0-9.]+)/gi, '$1$2 $3 $4 $5 $6 $7 $8') - .replace(/\n\n+/g, "\n") + .replace(/\n\s+\n+/g, "\n") .replace(/ - - diff --git a/src/_icons/api-off.svg b/src/_icons/api-off.svg index 69101bfd3..db93b8349 100644 --- a/src/_icons/api-off.svg +++ b/src/_icons/api-off.svg @@ -6,6 +6,4 @@ - - diff --git a/src/_icons/atom-off.svg b/src/_icons/atom-off.svg index 609a6be6b..d8016cac5 100644 --- a/src/_icons/atom-off.svg +++ b/src/_icons/atom-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/award-off.svg b/src/_icons/award-off.svg index c265f5e35..4a4589ae1 100644 --- a/src/_icons/award-off.svg +++ b/src/_icons/award-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/badge-off.svg b/src/_icons/badge-off.svg index 35725d270..b6a97287a 100644 --- a/src/_icons/badge-off.svg +++ b/src/_icons/badge-off.svg @@ -3,6 +3,4 @@ - - diff --git a/src/_icons/badges-off.svg b/src/_icons/badges-off.svg index db3e2612a..17c4f1c0e 100644 --- a/src/_icons/badges-off.svg +++ b/src/_icons/badges-off.svg @@ -4,6 +4,4 @@ - - diff --git a/src/_icons/ballon-off.svg b/src/_icons/ballon-off.svg index c652b917e..eb934d01a 100644 --- a/src/_icons/ballon-off.svg +++ b/src/_icons/ballon-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/barrel-off.svg b/src/_icons/barrel-off.svg index 5efbc913d..7ea313d05 100644 --- a/src/_icons/barrel-off.svg +++ b/src/_icons/barrel-off.svg @@ -7,6 +7,4 @@ - - diff --git a/src/_icons/bath-off.svg b/src/_icons/bath-off.svg index 68fcf9fa4..5bc7750e5 100644 --- a/src/_icons/bath-off.svg +++ b/src/_icons/bath-off.svg @@ -6,6 +6,4 @@ - - diff --git a/src/_icons/bed-off.svg b/src/_icons/bed-off.svg index 4414d6f28..0d16a2356 100644 --- a/src/_icons/bed-off.svg +++ b/src/_icons/bed-off.svg @@ -8,6 +8,4 @@ - - diff --git a/src/_icons/beer-off.svg b/src/_icons/beer-off.svg index f5d225ad6..e47b86986 100644 --- a/src/_icons/beer-off.svg +++ b/src/_icons/beer-off.svg @@ -4,6 +4,4 @@ - - diff --git a/src/_icons/box-off.svg b/src/_icons/box-off.svg index 98b90900a..dc77ab61d 100644 --- a/src/_icons/box-off.svg +++ b/src/_icons/box-off.svg @@ -6,6 +6,4 @@ - - diff --git a/src/_icons/bucket-off.svg b/src/_icons/bucket-off.svg index 11ee19dd9..79555633c 100644 --- a/src/_icons/bucket-off.svg +++ b/src/_icons/bucket-off.svg @@ -4,6 +4,4 @@ - - diff --git a/src/_icons/cake-off.svg b/src/_icons/cake-off.svg index 5713dbd34..29de262be 100644 --- a/src/_icons/cake-off.svg +++ b/src/_icons/cake-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/cash-off.svg b/src/_icons/cash-off.svg index 5bfd30958..ab09987d9 100644 --- a/src/_icons/cash-off.svg +++ b/src/_icons/cash-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/coffee-off.svg b/src/_icons/coffee-off.svg index 4e7556d6a..170191379 100644 --- a/src/_icons/coffee-off.svg +++ b/src/_icons/coffee-off.svg @@ -7,6 +7,4 @@ - - diff --git a/src/_icons/container-off.svg b/src/_icons/container-off.svg index fbb1bd4a6..a44b6ece6 100644 --- a/src/_icons/container-off.svg +++ b/src/_icons/container-off.svg @@ -13,6 +13,4 @@ - - diff --git a/src/_icons/cpu-off.svg b/src/_icons/cpu-off.svg index fdc6fef22..1485f2cde 100644 --- a/src/_icons/cpu-off.svg +++ b/src/_icons/cpu-off.svg @@ -12,6 +12,4 @@ - - diff --git a/src/_icons/crane-off.svg b/src/_icons/crane-off.svg index a6eb8cf39..1d0f1d1c1 100644 --- a/src/_icons/crane-off.svg +++ b/src/_icons/crane-off.svg @@ -9,6 +9,4 @@ - - diff --git a/src/_icons/creative-commons-off.svg b/src/_icons/creative-commons-off.svg index 40abcf3e6..1e6091f30 100644 --- a/src/_icons/creative-commons-off.svg +++ b/src/_icons/creative-commons-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/cross-off.svg b/src/_icons/cross-off.svg index 2e3d65c23..338b92253 100644 --- a/src/_icons/cross-off.svg +++ b/src/_icons/cross-off.svg @@ -3,6 +3,4 @@ - - diff --git a/src/_icons/crutches-off.svg b/src/_icons/crutches-off.svg index bb020c81c..410c37965 100644 --- a/src/_icons/crutches-off.svg +++ b/src/_icons/crutches-off.svg @@ -7,6 +7,4 @@ - - diff --git a/src/_icons/cup-off.svg b/src/_icons/cup-off.svg index 7e34fb48c..bea2a700d 100644 --- a/src/_icons/cup-off.svg +++ b/src/_icons/cup-off.svg @@ -6,6 +6,4 @@ - - diff --git a/src/_icons/current-location-off.svg b/src/_icons/current-location-off.svg index a005552f1..dc632e2b9 100644 --- a/src/_icons/current-location-off.svg +++ b/src/_icons/current-location-off.svg @@ -8,6 +8,4 @@ - - diff --git a/src/_icons/cursor-off.svg b/src/_icons/cursor-off.svg index f7475cfd8..df06ac992 100644 --- a/src/_icons/cursor-off.svg +++ b/src/_icons/cursor-off.svg @@ -4,6 +4,4 @@ - - diff --git a/src/_icons/dental-off.svg b/src/_icons/dental-off.svg index 308bbf295..5038c7223 100644 --- a/src/_icons/dental-off.svg +++ b/src/_icons/dental-off.svg @@ -4,6 +4,4 @@ - - diff --git a/src/_icons/device-nintendo-off.svg b/src/_icons/device-nintendo-off.svg index c5565ff3c..7bbd8a445 100644 --- a/src/_icons/device-nintendo-off.svg +++ b/src/_icons/device-nintendo-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/device-speaker-off.svg b/src/_icons/device-speaker-off.svg index 44b821431..5265009c6 100644 --- a/src/_icons/device-speaker-off.svg +++ b/src/_icons/device-speaker-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/devices-pc-off.svg b/src/_icons/devices-pc-off.svg index 44b9f37e0..e2919e602 100644 --- a/src/_icons/devices-pc-off.svg +++ b/src/_icons/devices-pc-off.svg @@ -8,6 +8,4 @@ - - diff --git a/src/_icons/dialpad-off.svg b/src/_icons/dialpad-off.svg index 6a8d18b78..8e759dbe8 100644 --- a/src/_icons/dialpad-off.svg +++ b/src/_icons/dialpad-off.svg @@ -9,6 +9,4 @@ - - diff --git a/src/_icons/diamond-off.svg b/src/_icons/diamond-off.svg index 93e4b2a81..0cf26a987 100644 --- a/src/_icons/diamond-off.svg +++ b/src/_icons/diamond-off.svg @@ -4,6 +4,4 @@ - - diff --git a/src/_icons/directions-off.svg b/src/_icons/directions-off.svg index 65f97a0c5..3e98a27b0 100644 --- a/src/_icons/directions-off.svg +++ b/src/_icons/directions-off.svg @@ -8,6 +8,4 @@ - - diff --git a/src/_icons/disabled-off.svg b/src/_icons/disabled-off.svg index 32805da66..02bd6181c 100644 --- a/src/_icons/disabled-off.svg +++ b/src/_icons/disabled-off.svg @@ -6,6 +6,4 @@ - - diff --git a/src/_icons/disc-off.svg b/src/_icons/disc-off.svg index 4120c060e..89763da16 100644 --- a/src/_icons/disc-off.svg +++ b/src/_icons/disc-off.svg @@ -6,6 +6,4 @@ - - diff --git a/src/_icons/dna-2-off.svg b/src/_icons/dna-2-off.svg index d81bd5c3a..a194f1098 100644 --- a/src/_icons/dna-2-off.svg +++ b/src/_icons/dna-2-off.svg @@ -8,6 +8,4 @@ - - diff --git a/src/_icons/dna-off.svg b/src/_icons/dna-off.svg index 5191a2b25..574981bf2 100644 --- a/src/_icons/dna-off.svg +++ b/src/_icons/dna-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/door-off.svg b/src/_icons/door-off.svg index 58afbcc0b..b771f6cf0 100644 --- a/src/_icons/door-off.svg +++ b/src/_icons/door-off.svg @@ -6,6 +6,4 @@ - - diff --git a/src/_icons/download-off.svg b/src/_icons/download-off.svg index e49248cca..15b033146 100644 --- a/src/_icons/download-off.svg +++ b/src/_icons/download-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/edit-circle-off.svg b/src/_icons/edit-circle-off.svg index 2c0045cf5..716bb6c93 100644 --- a/src/_icons/edit-circle-off.svg +++ b/src/_icons/edit-circle-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/edit-off.svg b/src/_icons/edit-off.svg index bbd241896..2fc88fbd9 100644 --- a/src/_icons/edit-off.svg +++ b/src/_icons/edit-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/egg-off.svg b/src/_icons/egg-off.svg index dc5313c6e..d2c904eb1 100644 --- a/src/_icons/egg-off.svg +++ b/src/_icons/egg-off.svg @@ -3,6 +3,4 @@ - - diff --git a/src/_icons/engine-off.svg b/src/_icons/engine-off.svg index fabd0dc67..c8a009df2 100644 --- a/src/_icons/engine-off.svg +++ b/src/_icons/engine-off.svg @@ -7,6 +7,4 @@ - - diff --git a/src/_icons/error-404-off.svg b/src/_icons/error-404-off.svg index 2b4d781fa..16a4711fb 100644 --- a/src/_icons/error-404-off.svg +++ b/src/_icons/error-404-off.svg @@ -7,6 +7,4 @@ - - diff --git a/src/_icons/exchange-off.svg b/src/_icons/exchange-off.svg index af66c4d65..ba426381a 100644 --- a/src/_icons/exchange-off.svg +++ b/src/_icons/exchange-off.svg @@ -8,6 +8,4 @@ - - diff --git a/src/_icons/exclamation-mark-off.svg b/src/_icons/exclamation-mark-off.svg index f5f06c165..096a8bee4 100644 --- a/src/_icons/exclamation-mark-off.svg +++ b/src/_icons/exclamation-mark-off.svg @@ -4,6 +4,4 @@ - - diff --git a/src/_icons/external-link-off.svg b/src/_icons/external-link-off.svg index a7604dcfb..63e5f83ef 100644 --- a/src/_icons/external-link-off.svg +++ b/src/_icons/external-link-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/eyeglass-off.svg b/src/_icons/eyeglass-off.svg index 76c21494e..f77546f1f 100644 --- a/src/_icons/eyeglass-off.svg +++ b/src/_icons/eyeglass-off.svg @@ -7,6 +7,4 @@ - - diff --git a/src/_icons/face-mask-off.svg b/src/_icons/face-mask-off.svg index 62de4d1fe..0db86fa71 100644 --- a/src/_icons/face-mask-off.svg +++ b/src/_icons/face-mask-off.svg @@ -7,6 +7,4 @@ - - diff --git a/src/_icons/feather-off.svg b/src/_icons/feather-off.svg index 2f107bb19..63a5f42b1 100644 --- a/src/_icons/feather-off.svg +++ b/src/_icons/feather-off.svg @@ -9,6 +9,4 @@ - - diff --git a/src/_icons/fence-off.svg b/src/_icons/fence-off.svg index 9d096aaaa..35293e1fd 100644 --- a/src/_icons/fence-off.svg +++ b/src/_icons/fence-off.svg @@ -7,6 +7,4 @@ - - diff --git a/src/_icons/fingerprint-off.svg b/src/_icons/fingerprint-off.svg index 3e1f0404f..aed04b4c6 100644 --- a/src/_icons/fingerprint-off.svg +++ b/src/_icons/fingerprint-off.svg @@ -7,6 +7,4 @@ - - diff --git a/src/_icons/fish-off.svg b/src/_icons/fish-off.svg index 13cf38aa8..0cb1bb4cf 100644 --- a/src/_icons/fish-off.svg +++ b/src/_icons/fish-off.svg @@ -6,6 +6,4 @@ - - diff --git a/src/_icons/flag-2-off.svg b/src/_icons/flag-2-off.svg index 745ee7062..ce112aafe 100644 --- a/src/_icons/flag-2-off.svg +++ b/src/_icons/flag-2-off.svg @@ -3,6 +3,4 @@ - - diff --git a/src/_icons/flag-off.svg b/src/_icons/flag-off.svg index 663154691..5b6850662 100644 --- a/src/_icons/flag-off.svg +++ b/src/_icons/flag-off.svg @@ -6,6 +6,4 @@ - - diff --git a/src/_icons/flame-off.svg b/src/_icons/flame-off.svg index 1afe2939c..af8b27ec8 100644 --- a/src/_icons/flame-off.svg +++ b/src/_icons/flame-off.svg @@ -3,6 +3,4 @@ - - diff --git a/src/_icons/flask-2-off.svg b/src/_icons/flask-2-off.svg index 66c39b47d..16ca37e35 100644 --- a/src/_icons/flask-2-off.svg +++ b/src/_icons/flask-2-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/flask-off.svg b/src/_icons/flask-off.svg index e11383ebb..a45ba2baa 100644 --- a/src/_icons/flask-off.svg +++ b/src/_icons/flask-off.svg @@ -5,6 +5,4 @@ - - diff --git a/src/_icons/flower-off.svg b/src/_icons/flower-off.svg index 9d0bdac0f..956541960 100644 --- a/src/_icons/flower-off.svg +++ b/src/_icons/flower-off.svg @@ -4,6 +4,4 @@ - -