diff --git a/_import.sh b/_import.sh index 3be4ac8dab..6b7c124736 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 5cb1bf57b1..4a07d75d69 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 69101bfd34..db93b8349d 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 609a6be6b6..d8016cac5f 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 c265f5e355..4a4589ae16 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 35725d2706..b6a97287a7 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 db3e2612a7..17c4f1c0e9 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 c652b917e4..eb934d01af 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 5efbc913d0..7ea313d05d 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 68fcf9fa4e..5bc7750e54 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 4414d6f283..0d16a2356b 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 f5d225ad65..e47b86986b 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 98b90900a5..dc77ab61da 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 11ee19dd9b..79555633c2 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 5713dbd342..29de262be8 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 5bfd30958c..ab09987d99 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 4e7556d6a9..1701913792 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 fbb1bd4a67..a44b6ece62 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 fdc6fef22d..1485f2cde3 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 a6eb8cf392..1d0f1d1c10 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 40abcf3e69..1e6091f30e 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 2e3d65c23f..338b922531 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 bb020c81c3..410c379658 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 7e34fb48c3..bea2a700d4 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 a005552f1e..dc632e2b9c 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 f7475cfd81..df06ac9921 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 308bbf2958..5038c7223a 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 c5565ff3ca..7bbd8a4455 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 44b8214313..5265009c68 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 44b9f37e05..e2919e6023 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 6a8d18b788..8e759dbe83 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 93e4b2a819..0cf26a9878 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 65f97a0c5a..3e98a27b09 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 32805da666..02bd6181c0 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 4120c060ee..89763da16b 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 d81bd5c3ac..a194f1098e 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 5191a2b251..574981bf2f 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 58afbcc0b4..b771f6cf03 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 e49248cca4..15b0331469 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 2c0045cf5a..716bb6c934 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 bbd2418960..2fc88fbd99 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 dc5313c6e3..d2c904eb1e 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 fabd0dc67b..c8a009df25 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 2b4d781fa5..16a4711fb2 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 af66c4d655..ba426381a6 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 f5f06c1658..096a8bee48 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 a7604dcfbc..63e5f83ef5 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 76c21494e5..f77546f1fd 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 62de4d1fe6..0db86fa714 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 2f107bb19b..63a5f42b19 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 9d096aaaa5..35293e1fd6 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 3e1f0404f6..aed04b4c63 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 13cf38aa8d..0cb1bb4cf0 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 745ee70620..ce112aafeb 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 663154691d..5b68506622 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 1afe2939c3..af8b27ec8d 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 66c39b47da..16ca37e358 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 e11383ebbc..a45ba2baa6 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 9d0bdac0f3..956541960e 100644 --- a/src/_icons/flower-off.svg +++ b/src/_icons/flower-off.svg @@ -4,6 +4,4 @@ - -