aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcodecalm <codecalm@gmail.com>2020-04-07 20:28:06 +0200
committercodecalm <codecalm@gmail.com>2020-04-07 20:28:06 +0200
commit17a33fa302596b285edd2ae0c6ae0cb9797f72e8 (patch)
treeda9142609d54149890bce86785cef6259d5b3c23
parentnpm files fixes (diff)
parentcurrency yen fix (diff)
downloadtabler-icons-17a33fa302596b285edd2ae0c6ae0cb9797f72e8.tar.xz
Merge branches 'dev' and 'master' of https://github.com/tabler/tabler-icons
-rw-r--r--gulpfile.js4
-rw-r--r--src/_icons/accessible.svg7
-rw-r--r--src/_icons/check.svg2
-rw-r--r--src/_icons/checks.svg7
-rw-r--r--src/_icons/currency-bitcoin.svg11
-rw-r--r--src/_icons/currency-pound.svg5
-rw-r--r--src/_icons/currency-rupee.svg6
-rw-r--r--src/_icons/currency-yen.svg7
-rw-r--r--src/_icons/device-mobile-vibration.svg6
-rw-r--r--src/_icons/disabled-2.svg8
-rw-r--r--src/_icons/file-check.svg2
-rw-r--r--src/_icons/file-download.svg2
-rw-r--r--src/_icons/file-horizontal.svg7
-rw-r--r--src/_icons/file-invoice.svg2
-rw-r--r--src/_icons/file-minus.svg2
-rw-r--r--src/_icons/file-music.svg2
-rw-r--r--src/_icons/file-plus.svg2
-rw-r--r--src/_icons/file-text.svg2
-rw-r--r--src/_icons/file-x.svg2
-rw-r--r--src/_icons/file.svg2
-rw-r--r--src/_icons/float-center.svg11
-rw-r--r--src/_icons/float-left.svg9
-rw-r--r--src/_icons/float-right.svg9
-rw-r--r--src/_icons/rotate-2.svg7
-rw-r--r--src/_icons/rotate-clockwise-2.svg7
-rw-r--r--src/_icons/rotate-clockwise.svg2
-rw-r--r--src/_icons/rotate.svg2
-rw-r--r--src/_includes/toolbar.html12
-rw-r--r--src/editor.html15
29 files changed, 133 insertions, 29 deletions
diff --git a/gulpfile.js b/gulpfile.js
index 967de80..9a5b6e6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -414,7 +414,9 @@ gulp.task('optimize', function (cb) {
.replace(/a\s?([0-9.]+)\s([0-9.]+)\s([0-9.]+)\s?([0-1])\s?([0-1])\s?(-?[0-9.]+)\s?(-?[0-9.]+)/g, 'a$1 $2 $3 $4 $5 $6 $7')
.replace(/\n\n+/g, "\n");
- fs.writeFileSync(file, svgFileContent);
+ if(svgFile.toString() !== svgFileContent) {
+ fs.writeFileSync(file, svgFileContent);
+ }
});
cb();
diff --git a/src/_icons/accessible.svg b/src/_icons/accessible.svg
new file mode 100644
index 0000000..6bc6f90
--- /dev/null
+++ b/src/_icons/accessible.svg
@@ -0,0 +1,7 @@
+---
+---
+<svg>
+ <circle cx="12" cy="12" r="9" />
+ <path d="M10 16.5l2 -3l2 3m-2 -3v-2l3 -1m-6 0l3 1" />
+ <circle cx="12" cy="7.5" r=".5" />
+</svg>
diff --git a/src/_icons/check.svg b/src/_icons/check.svg
index ba7315f..00febeb 100644
--- a/src/_icons/check.svg
+++ b/src/_icons/check.svg
@@ -2,5 +2,5 @@
tags: [tick, "yes"]
---
<svg>
- <polyline points="20 7 10 17 5 12" />
+ <path d="M5 12l5 5l10 -10" />
</svg>
diff --git a/src/_icons/checks.svg b/src/_icons/checks.svg
new file mode 100644
index 0000000..d0d7a9c
--- /dev/null
+++ b/src/_icons/checks.svg
@@ -0,0 +1,7 @@
+---
+tags: [tick, "yes"]
+---
+<svg>
+ <path d="M7 12l5 5l10 -10" />
+ <path d="M2 12l5 5m5 -5l5 -5" />
+</svg>
diff --git a/src/_icons/currency-bitcoin.svg b/src/_icons/currency-bitcoin.svg
new file mode 100644
index 0000000..da83098
--- /dev/null
+++ b/src/_icons/currency-bitcoin.svg
@@ -0,0 +1,11 @@
+---
+---
+<svg>
+ <path d="M6 6h8a3 3 0 0 1 0 6a3 3 0 0 1 0 6h-8" />
+ <line x1="8" y1="6" x2="8" y2="18" />
+ <line x1="8" y1="12" x2="14" y2="12" />
+ <line x1="9" y1="3" x2="9" y2="6" />
+ <line x1="13" y1="3" x2="13" y2="6" />
+ <line x1="9" y1="18" x2="9" y2="21" />
+ <line x1="13" y1="18" x2="13" y2="21" />
+</svg>
diff --git a/src/_icons/currency-pound.svg b/src/_icons/currency-pound.svg
new file mode 100644
index 0000000..8f58cf3
--- /dev/null
+++ b/src/_icons/currency-pound.svg
@@ -0,0 +1,5 @@
+---
+---
+<svg>
+ <path d="M17 18.5a6 6 0 0 1 -5 0a6 6 0 0 0 -5 .5a3 3 0 0 0 2 -2.5v-7.5a4 4 0 0 1 7.45 -2m-2.55 6h-7" />
+</svg>
diff --git a/src/_icons/currency-rupee.svg b/src/_icons/currency-rupee.svg
new file mode 100644
index 0000000..75a04ed
--- /dev/null
+++ b/src/_icons/currency-rupee.svg
@@ -0,0 +1,6 @@
+---
+---
+<svg>
+ <path d="M18 6h-11h3a4 4 0 0 1 0 8h-3l6 6" />
+ <line x1="7" y1="10" x2="18" y2="10" />
+</svg>
diff --git a/src/_icons/currency-yen.svg b/src/_icons/currency-yen.svg
new file mode 100644
index 0000000..60866c5
--- /dev/null
+++ b/src/_icons/currency-yen.svg
@@ -0,0 +1,7 @@
+---
+---
+<svg>
+ <path d="M12 19v-7l-5 -7m10 0l-5 7" />
+ <line x1="8" y1="17" x2="16" y2="17" />
+ <line x1="8" y1="13" x2="16" y2="13" />
+</svg>
diff --git a/src/_icons/device-mobile-vibration.svg b/src/_icons/device-mobile-vibration.svg
index 5227c7b..a4ea18e 100644
--- a/src/_icons/device-mobile-vibration.svg
+++ b/src/_icons/device-mobile-vibration.svg
@@ -2,11 +2,11 @@
tags: [iphone, phone, smartphone, cellphone]
---
<svg>
- <g transform="rotate(20 12 12)">
+ <g transform="rotate(15 12 12)">
<rect x="7" y="4" width="10" height="16" rx="1" />
<line x1="11" y1="5" x2="13" y2="5" />
<line x1="12" y1="17" x2="12" y2="17.01" />
- <line x1="3" y1="8" x2="3" y2="16" />
- <line x1="21" y1="8" x2="21" y2="16" />
+ <path d="M21 8l1 2l-1 2l1 2l-1 2" />
+ <path d="M3 8l-1 2l1 2l-1 2l1 2" />
</g>
</svg>
diff --git a/src/_icons/disabled-2.svg b/src/_icons/disabled-2.svg
new file mode 100644
index 0000000..131a9dc
--- /dev/null
+++ b/src/_icons/disabled-2.svg
@@ -0,0 +1,8 @@
+---
+tags: [wheelchair, accessible]
+---
+<svg>
+ <circle cx="17" cy="6" r="2" />
+ <path d="M9 11a4.97 4.97 0 1 0 3.95 7.95" />
+ <path d="M19 20l-4 -5h-4l3 -5l-4 -3l-4 1" />
+</svg>
diff --git a/src/_icons/file-check.svg b/src/_icons/file-check.svg
index 6b36c38..37d72d0 100644
--- a/src/_icons/file-check.svg
+++ b/src/_icons/file-check.svg
@@ -3,6 +3,6 @@ tags: ["yes"]
---
<svg>
<polyline points="14 3 14 8 19 8" />
- <path d="M17 21H7a2 2 0 0 1 -2 -2V5a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
+ <path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
<path d="M9 15l2 2l4 -4" />
</svg>
diff --git a/src/_icons/file-download.svg b/src/_icons/file-download.svg
index bb43bf3..5edd467 100644
--- a/src/_icons/file-download.svg
+++ b/src/_icons/file-download.svg
@@ -3,7 +3,7 @@ tags: []
---
<svg>
<polyline points="14 3 14 8 19 8" />
- <path d="M17 21H7a2 2 0 0 1 -2 -2V5a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
+ <path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
<line x1="12" y1="11" x2="12" y2="17" />
<polyline points="9 14 12 17 15 14" />
</svg>
diff --git a/src/_icons/file-horizontal.svg b/src/_icons/file-horizontal.svg
new file mode 100644
index 0000000..86d5ecd
--- /dev/null
+++ b/src/_icons/file-horizontal.svg
@@ -0,0 +1,7 @@
+---
+tags: [paper, new]
+---
+<svg>
+ <polyline points="16 5 16 10 21 10" />
+ <path d="M3 7v10a2 2 0 0 0 2 2h14a2 2 0 0 0 2 -2v-7l-5 -5h-11a2 2 0 0 0 -2 2z" />
+</svg>
diff --git a/src/_icons/file-invoice.svg b/src/_icons/file-invoice.svg
index 69a9de6..eb54b0d 100644
--- a/src/_icons/file-invoice.svg
+++ b/src/_icons/file-invoice.svg
@@ -2,7 +2,7 @@
---
<svg>
<polyline points="14 3 14 8 19 8" />
- <path d="M17 21H7a2 2 0 0 1 -2 -2V5a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
+ <path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
<line x1="9" y1="7" x2="10" y2="7" />
<line x1="9" y1="13" x2="15" y2="13" />
<line x1="13" y1="17" x2="15" y2="17" />
diff --git a/src/_icons/file-minus.svg b/src/_icons/file-minus.svg
index 0eef13d..d9fe071 100644
--- a/src/_icons/file-minus.svg
+++ b/src/_icons/file-minus.svg
@@ -3,6 +3,6 @@ tags: [remove]
---
<svg>
<polyline points="14 3 14 8 19 8" />
- <path d="M17 21H7a2 2 0 0 1 -2 -2V5a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
+ <path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
<line x1="9" y1="14" x2="15" y2="14" />
</svg>
diff --git a/src/_icons/file-music.svg b/src/_icons/file-music.svg
index 58cfe55..f905419 100644
--- a/src/_icons/file-music.svg
+++ b/src/_icons/file-music.svg
@@ -3,7 +3,7 @@ tags: [mp3, wma, wav]
---
<svg>
<polyline points="14 3 14 8 19 8" />
- <path d="M17 21H7a2 2 0 0 1 -2 -2V5a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
+ <path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
<circle cx="11" cy="16" r="1" />
<polyline points="12 16 12 11 14 12" />
</svg>
diff --git a/src/_icons/file-plus.svg b/src/_icons/file-plus.svg
index a41b3bd..0e91546 100644
--- a/src/_icons/file-plus.svg
+++ b/src/_icons/file-plus.svg
@@ -3,7 +3,7 @@ tags: [add, create, new]
---
<svg>
<polyline points="14 3 14 8 19 8" />
- <path d="M17 21H7a2 2 0 0 1 -2 -2V5a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
+ <path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
<line x1="12" y1="11" x2="12" y2="17" />
<line x1="9" y1="14" x2="15" y2="14" />
</svg>
diff --git a/src/_icons/file-text.svg b/src/_icons/file-text.svg
index f9d8e17..2a594cd 100644
--- a/src/_icons/file-text.svg
+++ b/src/_icons/file-text.svg
@@ -3,7 +3,7 @@ tags: [data, pdf, txt]
---
<svg>
<polyline points="14 3 14 8 19 8" />
- <path d="M17 21H7a2 2 0 0 1 -2 -2V5a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
+ <path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
<line x1="9" y1="9" x2="10" y2="9" />
<line x1="9" y1="13" x2="15" y2="13" />
<line x1="9" y1="17" x2="15" y2="17" />
diff --git a/src/_icons/file-x.svg b/src/_icons/file-x.svg
index bd58f8b..b83bcba 100644
--- a/src/_icons/file-x.svg
+++ b/src/_icons/file-x.svg
@@ -3,6 +3,6 @@ tags: [remove, delete, erase]
---
<svg>
<polyline points="14 3 14 8 19 8" />
- <path d="M17 21H7a2 2 0 0 1 -2 -2V5a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
+ <path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
<path d="M10 12l4 4m0 -4l-4 4" />
</svg>
diff --git a/src/_icons/file.svg b/src/_icons/file.svg
index 0318b8c..c6223d8 100644
--- a/src/_icons/file.svg
+++ b/src/_icons/file.svg
@@ -3,5 +3,5 @@ tags: [paper, new]
---
<svg>
<polyline points="14 3 14 8 19 8" />
- <path d="M17 21H7a2 2 0 0 1 -2 -2V5a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
+ <path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" />
</svg>
diff --git a/src/_icons/float-center.svg b/src/_icons/float-center.svg
new file mode 100644
index 0000000..09ed83d
--- /dev/null
+++ b/src/_icons/float-center.svg
@@ -0,0 +1,11 @@
+---
+---
+<svg>
+ <rect width="6" height="6" x="9" y="5" rx="1" />
+ <line x1="4" y1="7" x2="5" y2="7" />
+ <line x1="4" y1="11" x2="5" y2="11" />
+ <line x1="19" y1="7" x2="20" y2="7" />
+ <line x1="19" y1="11" x2="20" y2="11" />
+ <line x1="4" y1="15" x2="20" y2="15" />
+ <line x1="4" y1="19" x2="20" y2="19" />
+</svg>
diff --git a/src/_icons/float-left.svg b/src/_icons/float-left.svg
new file mode 100644
index 0000000..ea7c05b
--- /dev/null
+++ b/src/_icons/float-left.svg
@@ -0,0 +1,9 @@
+---
+---
+<svg>
+ <rect width="6" height="6" x="4" y="5" rx="1" />
+ <line x1="14" y1="7" x2="20" y2="7" />
+ <line x1="14" y1="11" x2="20" y2="11" />
+ <line x1="4" y1="15" x2="20" y2="15" />
+ <line x1="4" y1="19" x2="20" y2="19" />
+</svg>
diff --git a/src/_icons/float-right.svg b/src/_icons/float-right.svg
new file mode 100644
index 0000000..4953e77
--- /dev/null
+++ b/src/_icons/float-right.svg
@@ -0,0 +1,9 @@
+---
+---
+<svg>
+ <rect width="6" height="6" x="14" y="5" rx="1" />
+ <line x1="4" y1="7" x2="10" y2="7" />
+ <line x1="4" y1="11" x2="10" y2="11" />
+ <line x1="4" y1="15" x2="20" y2="15" />
+ <line x1="4" y1="19" x2="20" y2="19" />
+</svg>
diff --git a/src/_icons/rotate-2.svg b/src/_icons/rotate-2.svg
new file mode 100644
index 0000000..ac489c0
--- /dev/null
+++ b/src/_icons/rotate-2.svg
@@ -0,0 +1,7 @@
+---
+tags: [refresh, synchronization, reload, restart, spinner, loader, ajax, update, arrows]
+---
+<svg>
+ <path d="M12 4a8 8 0 0 0 -3 15.45m0 -4.45v5h-5" />
+ <path d="M13 19.95a8 8 0 0 0 2 -15.35" stroke-dasharray=".001 4" />
+</svg>
diff --git a/src/_icons/rotate-clockwise-2.svg b/src/_icons/rotate-clockwise-2.svg
new file mode 100644
index 0000000..c17ed1d
--- /dev/null
+++ b/src/_icons/rotate-clockwise-2.svg
@@ -0,0 +1,7 @@
+---
+tags: [refresh, synchronization, reload, restart, spinner, loader, ajax, update, arrows]
+---
+<svg>
+ <path d="M12 4a8 8 0 0 1 3 15.45m0 -4.45v5h5" />
+ <path d="M11 19.95a8 8 0 0 1 -2 -15.35" stroke-dasharray=".001 4" />
+</svg>
diff --git a/src/_icons/rotate-clockwise.svg b/src/_icons/rotate-clockwise.svg
index 07a01f3..282bbac 100644
--- a/src/_icons/rotate-clockwise.svg
+++ b/src/_icons/rotate-clockwise.svg
@@ -2,5 +2,5 @@
tags: [refresh, synchronization, reload, restart, spinner, loader, ajax, update, arrows]
---
<svg>
- <path d="M4 11a8.1 8.1 0 1 1 .5 4m-.5 5v-5h5" />
+ <path d="M4.05 11a8 8 0 1 1 .5 4m-.5 5v-5h5" />
</svg>
diff --git a/src/_icons/rotate.svg b/src/_icons/rotate.svg
index c85d9b2..0d3cf67 100644
--- a/src/_icons/rotate.svg
+++ b/src/_icons/rotate.svg
@@ -2,5 +2,5 @@
tags: [refresh, synchronization, reload, restart, spinner, loader, ajax, update, arrows]
---
<svg>
- <path d="M20 11a8.1 8.1 0 1 0 -.5 4m.5 5v-5h-5" />
+ <path d="M19.95 11a8 8 0 1 0 -.5 4m.5 5v-5h-5" />
</svg>
diff --git a/src/_includes/toolbar.html b/src/_includes/toolbar.html
new file mode 100644
index 0000000..afca900
--- /dev/null
+++ b/src/_includes/toolbar.html
@@ -0,0 +1,12 @@
+{% assign toolbar = include.toolbar | split: '|' %}
+
+<div class="toolbar">
+ {% for group in toolbar %}
+ {% assign buttons = group | split: ',' %}
+ <div class="buttons">
+ {% for button in buttons %}
+ <div class="button js-icon" data-icon="{{ button }}">{% include icon.html name=button %}</div>
+ {% endfor %}
+ </div>
+ {% endfor %}
+</div>
diff --git a/src/editor.html b/src/editor.html
index ccb4f7e..8a55e13 100644
--- a/src/editor.html
+++ b/src/editor.html
@@ -2,9 +2,6 @@
layout: default
---
-{% assign toolbar = 'arrow-back-up,arrow-forward-up,printer,paint|bold,italic,underline,strikethrough|align-left,align-center,align-right,align-justified,line-height|list,list-check|link,photo,table|sort-ascending,sort-descending|indent-increase,indent-decrease|subscript,superscript|minus,omega,chart-area-line,pencil|eraser,settings' | split: '|' %}
-
-
<div class="container">
<div class="box">
@@ -74,16 +71,8 @@ layout: default
</div>
<div class="mb">
- <div class="toolbar">
- {% for group in toolbar %}
- {% assign buttons = group | split: ',' %}
- <div class="buttons">
- {% for button in buttons %}
- <div class="button js-icon" data-icon="{{ button }}">{% include icon.html name=button %}</div>
- {% endfor %}
- </div>
- {% endfor %}
- </div>
+ {% include toolbar.html toolbar='arrow-back-up,arrow-forward-up,printer,paint|bold,italic,underline,strikethrough|align-left,align-center,align-right,align-justified,line-height|list,list-check|link,photo,table|sort-ascending,sort-descending|indent-increase,indent-decrease|subscript,superscript|minus,omega,chart-area-line,pencil|eraser,settings' %}
+ {% include toolbar.html toolbar='check,checks,x|currency-euro,currency-dollar,currency-bitcoin,currency-pound,currency-rupee,currency-yen' %}
</div>
<h2 class="icon-subtitle">{{ site.icons.size }} icons</h2>