1.1.3

devforth · Oct 25, 2020 · 1e4c1b7 · 1e4c1b7
1 parent e1b21e7
commit 1e4c1b7
Show file tree

Hide file tree

Showing 43 changed files with 1,041 additions and 2,820 deletions.
diff --git a/build/index.html b/build/index.html
@@ -55,8 +55,8 @@
   window.p = Painterro({
     hideByEsc: true,
     saveByEnter: true,
-    toolbarHeightPx: 50,
-    buttonSizePx: 42,
+    //toolbarHeightPx: 50,
+    //buttonSizePx: 42,
     // defaultTool: 'arrow',
     onChange: (e) => {console.log('onchange e', e)},
     onUndo: (e) => {console.log('onUndo e', e)},

diff --git a/css/icons/ptroiconfont.css b/css/icons/ptroiconfont.css
@@ -1,9 +1,9 @@
 @font-face {
 	font-family: "ptroiconfont";
-	src: url("ptroiconfont.eot?b666e7b3b9c053dcca216bcfb691d506?#iefix") format("embedded-opentype"),
-url("ptroiconfont.woff?b666e7b3b9c053dcca216bcfb691d506") format("woff"),
-url("ptroiconfont.ttf?b666e7b3b9c053dcca216bcfb691d506") format("truetype"),
-url("ptroiconfont.svg?b666e7b3b9c053dcca216bcfb691d506#ptroiconfont") format("svg");
+	src: url("ptroiconfont.eot?e4b1eb10da704919a5b2140cde3bea0c?#iefix") format("embedded-opentype"),
+url("ptroiconfont.woff?e4b1eb10da704919a5b2140cde3bea0c") format("woff"),
+url("ptroiconfont.ttf?e4b1eb10da704919a5b2140cde3bea0c") format("truetype"),
+url("ptroiconfont.svg?e4b1eb10da704919a5b2140cde3bea0c#ptroiconfont") format("svg");
 	font-weight: normal;
     font-style: normal;
 }
@@ -22,93 +22,90 @@ url("ptroiconfont.svg?b666e7b3b9c053dcca216bcfb691d506#ptroiconfont") format("sv
 	-moz-osx-font-smoothing: grayscale;
 }
 
-.ptro-icon-0painterro:before {
+.ptro-icon-apply:before {
 	content: "\f101";
 }
-.ptro-icon-apply:before {
+.ptro-icon-arrow:before {
 	content: "\f102";
 }
-.ptro-icon-arrow:before {
+.ptro-icon-brush:before {
 	content: "\f103";
 }
-.ptro-icon-blur:before {
+.ptro-icon-close:before {
 	content: "\f104";
 }
-.ptro-icon-brush:before {
+.ptro-icon-crop:before {
 	content: "\f105";
 }
-.ptro-icon-close:before {
+.ptro-icon-ellipse:before {
 	content: "\f106";
 }
-.ptro-icon-crop:before {
+.ptro-icon-eraser:before {
 	content: "\f107";
 }
-.ptro-icon-ellipse:before {
+.ptro-icon-line:before {
 	content: "\f108";
 }
-.ptro-icon-eraser:before {
+.ptro-icon-linked:before {
 	content: "\f109";
 }
-.ptro-icon-line:before {
+.ptro-icon-loading:before {
 	content: "\f10a";
 }
-.ptro-icon-linked:before {
+.ptro-icon-mirror:before {
 	content: "\f10b";
 }
-.ptro-icon-loading:before {
+.ptro-icon-open:before {
 	content: "\f10c";
 }
-.ptro-icon-mirror:before {
+.ptro-icon-painterro0:before {
 	content: "\f10d";
 }
-.ptro-icon-open:before {
-	content: "\f10e";
-}
 .ptro-icon-paste_extend_down:before {
-	content: "\f10f";
+	content: "\f10e";
 }
 .ptro-icon-paste_extend_right:before {
-	content: "\f110";
+	content: "\f10f";
 }
 .ptro-icon-paste_fit:before {
-	content: "\f111";
+	content: "\f110";
 }
 .ptro-icon-paste_over:before {
-	content: "\f112";
+	content: "\f111";
 }
 .ptro-icon-pipette:before {
-	content: "\f113";
+	content: "\f112";
 }
 .ptro-icon-pixelize:before {
-	content: "\f114";
+	content: "\f113";
 }
 .ptro-icon-rect:before {
-	content: "\f115";
+	content: "\f114";
 }
 .ptro-icon-redo:before {
-	content: "\f116";
+	content: "\f115";
 }
 .ptro-icon-resize:before {
-	content: "\f117";
+	content: "\f116";
 }
 .ptro-icon-rotate:before {
-	content: "\f118";
+	content: "\f117";
 }
 .ptro-icon-save:before {
-	content: "\f119";
+	content: "\f118";
 }
 .ptro-icon-select:before {
-	content: "\f11a";
+	content: "\f119";
 }
 .ptro-icon-settings:before {
-	content: "\f11b";
+	content: "\f11a";
 }
 .ptro-icon-text:before {
-	content: "\f11c";
+	content: "\f11b";
 }
 .ptro-icon-undo:before {
-	content: "\f11d";
+	content: "\f11c";
 }
 .ptro-icon-unlinked:before {
-	content: "\f11e";
+	content: "\f11d";
 }
diff --git a/css/icons/ptroiconfont.eot b/css/icons/ptroiconfont.eot
diff --git a/css/icons/ptroiconfont.svg b/css/icons/ptroiconfont.svg
diff --git a/css/icons/ptroiconfont.ttf b/css/icons/ptroiconfont.ttf
diff --git a/css/icons/ptroiconfont.woff b/css/icons/ptroiconfont.woff
diff --git a/css/styles.css b/css/styles.css
@@ -48,7 +48,7 @@
 
 
 .ptro-icon {
-    font-size: 20px;
+    font-size: 14px;
 }
 
 
@@ -498,7 +498,7 @@ span.ptro-btn-color-checkers-bar {
 
 .ptro-resize-link-wrapper {
     display: inline-block;
-    height: 20px;
+    height: 40px;
 }
 
 

diff --git a/generate_font.js b/generate_font.js
@@ -1,18 +1,22 @@
-const webfontsGenerator = require('webfonts-generator');
+const webfontsGenerator = require('vusion-webfonts-generator');
 const fs = require('fs');
 
-fs.readdir('res', function(err, items) {
+fs.readdir('res/font', function(err, items) {
   if (err) {
     console.log('cant read res directory');
   }
   const files = items.filter((i) => i.toLowerCase().endsWith('.svg')).map(
-    (i) => 'res/'+i);
+    (i) => 'res/font/'+i);
 
   webfontsGenerator({
     files: files,
     dest: 'css/icons',
     fontName: 'ptroiconfont',
-    cssTemplate: 'res/font-css.hbs',
+
+    // https://github.com/nfroidure/svgicons2svgfont
+    normalize: true,
+
+    cssTemplate: 'res/font/font-css.hbs',
     templateOptions: {
       classPrefix: 'ptro-icon-',
       baseSelector: '.ptro-icon'