Skip to content

Commit 17a33fa

Browse files
committed
Merge branches 'dev' and 'master' of https://github.com/tabler/tabler-icons
2 parents 99b980b + 47335aa commit 17a33fa

29 files changed

+133
-29
lines changed

Diff for: gulpfile.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,9 @@ gulp.task('optimize', function (cb) {
414414
.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')
415415
.replace(/\n\n+/g, "\n");
416416

417-
fs.writeFileSync(file, svgFileContent);
417+
if(svgFile.toString() !== svgFileContent) {
418+
fs.writeFileSync(file, svgFileContent);
419+
}
418420
});
419421

420422
cb();

Diff for: src/_icons/accessible.svg

+7
Loading

Diff for: src/_icons/check.svg

+1-1
Loading

Diff for: src/_icons/checks.svg

+7
Loading

Diff for: src/_icons/currency-bitcoin.svg

+11
Loading

Diff for: src/_icons/currency-pound.svg

+5
Loading

Diff for: src/_icons/currency-rupee.svg

+6
Loading

Diff for: src/_icons/currency-yen.svg

+7
Loading

Diff for: src/_icons/device-mobile-vibration.svg

+3-3
Loading

Diff for: src/_icons/disabled-2.svg

+8
Loading

Diff for: src/_icons/file-check.svg

+1-1
Loading

Diff for: src/_icons/file-download.svg

+1-1
Loading

Diff for: src/_icons/file-horizontal.svg

+7
Loading

Diff for: src/_icons/file-invoice.svg

+1-1
Loading

Diff for: src/_icons/file-minus.svg

+1-1
Loading

Diff for: src/_icons/file-music.svg

+1-1
Loading

Diff for: src/_icons/file-plus.svg

+1-1
Loading

Diff for: src/_icons/file-text.svg

+1-1
Loading

Diff for: src/_icons/file-x.svg

+1-1
Loading

Diff for: src/_icons/file.svg

+1-1
Loading

Diff for: src/_icons/float-center.svg

+11
Loading

Diff for: src/_icons/float-left.svg

+9
Loading

Diff for: src/_icons/float-right.svg

+9
Loading

Diff for: src/_icons/rotate-2.svg

+7
Loading

Diff for: src/_icons/rotate-clockwise-2.svg

+7
Loading

Diff for: src/_icons/rotate-clockwise.svg

+1-1
Loading

Diff for: src/_icons/rotate.svg

+1-1
Loading

Diff for: src/_includes/toolbar.html

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{% assign toolbar = include.toolbar | split: '|' %}
2+
3+
<div class="toolbar">
4+
{% for group in toolbar %}
5+
{% assign buttons = group | split: ',' %}
6+
<div class="buttons">
7+
{% for button in buttons %}
8+
<div class="button js-icon" data-icon="{{ button }}">{% include icon.html name=button %}</div>
9+
{% endfor %}
10+
</div>
11+
{% endfor %}
12+
</div>

Diff for: src/editor.html

+2-13
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: default
33
---
44

5-
{% 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: '|' %}
6-
7-
85
<div class="container">
96
<div class="box">
107

@@ -74,16 +71,8 @@ <h1 class="icon-title js-icon-name">{{ slug }}</h1>
7471
</div>
7572

7673
<div class="mb">
77-
<div class="toolbar">
78-
{% for group in toolbar %}
79-
{% assign buttons = group | split: ',' %}
80-
<div class="buttons">
81-
{% for button in buttons %}
82-
<div class="button js-icon" data-icon="{{ button }}">{% include icon.html name=button %}</div>
83-
{% endfor %}
84-
</div>
85-
{% endfor %}
86-
</div>
74+
{% 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' %}
75+
{% include toolbar.html toolbar='check,checks,x|currency-euro,currency-dollar,currency-bitcoin,currency-pound,currency-rupee,currency-yen' %}
8776
</div>
8877

8978
<h2 class="icon-subtitle">{{ site.icons.size }} icons</h2>

0 commit comments

Comments
 (0)