From acd4e2867eff82a04df57716809d392e2bedbeb4 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Wed, 3 Aug 2016 13:48:23 +0200 Subject: [PATCH] Add block icons --- Gruntfile.js | 44 +++++++ package.json | 7 +- src/demo.js | 13 -- src/editor/config/config.js | 45 +++++-- styles/css/main.css | 55 ++++++++- styles/fonts/font3336.eot | Bin 0 -> 3990 bytes styles/fonts/font3336.svg | 93 +++++++++++++++ styles/fonts/font3336.ttf | Bin 0 -> 3820 bytes styles/fonts/font3336.woff | Bin 0 -> 4096 bytes styles/fonts/font3336.woff2 | Bin 0 -> 1748 bytes styles/fonts/main-fonts.svg | 232 ++++++++++++++++++++++++++++++++++++ styles/scss/main.scss | 46 ++++++- 12 files changed, 508 insertions(+), 27 deletions(-) create mode 100644 styles/fonts/font3336.eot create mode 100644 styles/fonts/font3336.svg create mode 100644 styles/fonts/font3336.ttf create mode 100644 styles/fonts/font3336.woff create mode 100644 styles/fonts/font3336.woff2 create mode 100644 styles/fonts/main-fonts.svg diff --git a/Gruntfile.js b/Gruntfile.js index fc7cdc08c..49b132673 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -197,12 +197,56 @@ module.exports = function(grunt) { grunt.file.copy(appPath + '/' + configPath, buildPath + '/' + appPath + '/' + configPath); }); + grunt.registerTask('webfont-custom', function() { + var dir = './styles/fonts/'; + var destName = 'main-fonts'; + var donePromise = this.async(); + var svg2ttf = { + cmd: 'svg2ttf', + args: [dir + destName + '.svg', dir + destName + '.ttf'], + }; + var ttf2woff = { + cmd: 'ttf2woff', + args: [dir + destName + '.ttf', dir + destName + '.woff'], + }; + var ttf2woff2 = { + cmd: 'cat', + //args: [dir + destName + '.ttf', dir + destName + '.woff2'], + args: [dir + destName + '.ttf', '|', 'ttf2woff2', '>>', dir + destName + '.woff2'], + }; + var ttf2eot = { + cmd: 'ttf2eot', + args: [dir + destName + '.ttf', dir + destName + '.eot'], + }; + grunt.util.spawn(svg2ttf, function done(error, result, code) { + grunt.log.ok('.ttf file created'); + + grunt.util.spawn(ttf2woff, function done(error, result, code) { + grunt.log.ok('.woff file created'); + + grunt.util.spawn(ttf2eot, function done(error, result, code) { + grunt.log.ok('.eot file created'); + donePromise(); + /* + grunt.util.spawn(ttf2woff2, function done(error, result, code) { + grunt.log.ok('.woff2 file created'); + donePromise(); + }); + */ + }); + }); + }); + + }); + grunt.registerTask('bower', ['bowercopy']); grunt.registerTask('dev', ['bowercopy', 'connect', 'watch']); grunt.registerTask('test', ['jshint', 'mocha']); + grunt.registerTask('build:fonts', ['webfont-custom']); + grunt.registerTask('build', ['bowercopy', 'jshint', 'sass', 'before-rjs', 'requirejs', 'uglify', 'cssmin', 'concat', 'clean', 'copy']); grunt.registerTask('default', ['dev']); diff --git a/package.json b/package.json index 2bca12324..6e2cc5204 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,11 @@ "grunt-mocha": "^0.4.15", "grunt-sass": "^1.1.0", "istanbul": "^0.4.2", - "node-sass": "^3.4.2" + "node-sass": "^3.4.2", + "svg2ttf": "^4.0.1", + "ttf2eot": "^2.0.0", + "ttf2woff": "^2.0.1", + "ttf2woff2": "^2.0.3" }, "keywords": [ "wte", @@ -46,6 +50,7 @@ "scripts": { "postinstall": "node ./node_modules/bower/bin/bower install --config.interactive=false", "build": "./node_modules/.bin/grunt build", + "build:fonts": "./node_modules/.bin/grunt build:fonts", "test": "./node_modules/.bin/grunt test", "start": "./node_modules/.bin/grunt dev" } diff --git a/src/demo.js b/src/demo.js index dab9f5785..49b2900bd 100644 --- a/src/demo.js +++ b/src/demo.js @@ -77,19 +77,6 @@ panels: { className : 'fa fa-arrows', command : 'move-comp', stopDefaultCommand: 1, - },{ - id: 'image-comp', - className: 'fa fa-picture-o', - dragDrop: 1, - stopDefaultCommand: 1, - options: { - content: '
'+ - '
' + - '
' + - '
' + - '
' + - '
' - }, }] },{ id : 'options', diff --git a/src/editor/config/config.js b/src/editor/config/config.js index 351e978e3..d992c161d 100644 --- a/src/editor/config/config.js +++ b/src/editor/config/config.js @@ -100,34 +100,59 @@ define(function () { blockManager: { 'blocks': [{ id: 'b1', - label: 'Block1', + label: '1 Block', content: '

Block 1

', - attributes: { title: 'Block1', class:'b1-cl'} + attributes: {class:'wte-fonts wte-f-b1'} },{ id: 'b2', - label: '♥ Block2', + label: '2 Blocks', content: '

Block 2

', + attributes: {class:'wte-fonts wte-f-b2'} },{ id: 'b3', - label: 'Block3', + label: '3 Blocks', content: '
Block 3
', + attributes: {class:'wte-fonts wte-f-b3'} + },{ + id: 'b4', + label: '3/7 Block', + content: '
Block 4
', + attributes: {class:'wte-fonts wte-f-b37'} + },{ + id: 'hero', + label: 'Hero section', + content: '
Hero here
', + attributes: {class:'wte-fonts wte-f-hero'} + },{ + id: 'h1p', + label: 'Text section', + content: '
Text text text
', + attributes: {class:'wte-fonts wte-f-h1p'} + },{ + id: '3ba', + label: 'Badges', + content: '
Badges
', + attributes: {class:'wte-fonts wte-f-3ba'} },{ id: 'text', label: 'Text', - content: '
Insert your text here
', - },{ - id: 'text2', - label: 'Text2', + attributes: {class:'wte-fonts wte-f-text'}, content: { type:'text', content:'Insert your text here', - style: { padding: '10px' }, + style: {padding: '10px' }, activeOnRender: 1 }, },{ id: 'image', label: 'Image', - content: {type:'image', activeOnRender: 1}, + attributes: {class:'wte-fonts wte-f-image'}, + content: { type:'image', activeOnRender: 1}, + },{ + id: 'quo', + label: 'Quote', + content: 'Quote', + attributes: {class:'wte-fonts wte-f-quo'} }], }, diff --git a/styles/css/main.css b/styles/css/main.css index 9b8313eea..b30c8f944 100644 --- a/styles/css/main.css +++ b/styles/css/main.css @@ -2567,6 +2567,52 @@ $fontColorActive: #4f8ef7; */ /* darken($mainColor, 4%) - #383838*/ /*#515151*/ +@font-face { + font-family: 'font3336'; + src: url("../fonts/main-fonts.eot?v=1"); + src: url("../fonts/main-fonts.woff?v=1") format("woff"), url("../fonts/main-fonts.ttf?v=1") format("truetype"), url("../fonts/main-fonts.svg?v=1") format("svg"), url("../fonts/main-fonts.eot?v=1") format("embedded-opentype"); + font-weight: normal; + font-style: normal; } + +.wte-fonts:before { + display: block; + font: normal normal normal 14px font3336; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-size: 5em; } + +.wte-f-b1:before { + content: 'q'; } + +.wte-f-b2:before { + content: 'w'; } + +.wte-f-b3:before { + content: 'e'; } + +.wte-f-b37:before { + content: 'r'; } + +.wte-f-hero:before { + content: 't'; } + +.wte-f-h1p:before { + content: 'y'; } + +.wte-f-3ba:before { + content: 'u'; } + +.wte-f-image:before { + content: 'i'; } + +.wte-f-text:before { + content: 'o'; } + +.wte-f-quo:before { + content: 'p'; } + .wte-invis-invis, .wte-clm-tags #wte-clm-new, .wte-no-app { background-color: transparent; border: none; @@ -3418,9 +3464,14 @@ ol.example li.placeholder:before { width: 45%; padding: 1em; box-sizing: border-box; - height: 100px; + height: 90px; cursor: all-scroll; - margin: 2.5%; } + margin: 2.5%; + font-size: 11px; + font-weight: lighter; + display: flex; + flex-direction: column; + justify-content: flex-end; } .wte-block.wte-bdrag { width: auto; diff --git a/styles/fonts/font3336.eot b/styles/fonts/font3336.eot new file mode 100644 index 0000000000000000000000000000000000000000..923a599ead0775027ffef35571aeef35316dddc8 GIT binary patch literal 3990 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 literal 0 HcmV?d00001 diff --git a/styles/fonts/font3336.svg b/styles/fonts/font3336.svg new file mode 100644 index 000000000..0d090b2b1 --- /dev/null +++ b/styles/fonts/font3336.svg @@ -0,0 +1,93 @@ + + + + +Created by FontForge 20160407 at Wed Aug 3 01:36:42 2016 + By Jimmy Warting + + + + + + + + + + + + + + + + + + diff --git a/styles/fonts/font3336.ttf b/styles/fonts/font3336.ttf new file mode 100644 index 0000000000000000000000000000000000000000..33457758a1d334d4cd72569c69f2a17a95bbdb64 GIT binary patch literal 3820 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 kKkHmeyiz3mLm92|R!Zz+hx5B?ADU zC=%Bp0c9cWG~wupCi#%HlDIc%FM@)ZNz%m$jUm}Ek|svNZK_5vg9}L{X*MLzNrKQ7 zEeP1fGa!gmBZWwaP~QW*(4I~tZIHxwNo%@+AY-eKw|@ZX z9HJzRo&-Js41fav)S&D8!$~zLbf}sG|5Ia~r2Re{2VE3xLQuXV3WGuc4nyRn4F~79 z?b#bG*$^v-^=CGNw}{kr3Y6gMI5GgxxH1R)*B1@Mu)&7#=P}V~AZ8c{;Bo_*k<#4* z0BYcm4;GEe$K!|b-M2EfX~19&cq}&TU)1Q}5FX!$rxGfPN&{Vml(dz?6ksJXW-^?Y z@>m>N&7}8;Lq`rAuH#nViR0gCl4(W(F@U zt4e0n`dRFo*=cINv2xa-LO?K&@0k9IG_%u6Hsuo7C}=~Lv?*`xHtqMQF<*MUu6o9N zrXbnpaq((T8h5AOj7^GC_lJFdsd!W8B74lRSifri0y;~rNl2VIF09S$T-JO>p1|aa zwZPWSTUk?iHW(y`XKnA>+Ss}Tlx-SuQ6%y%r6P7ur;6MS3$T|>mt^>P`QP94_uZmU z*eDb`1(Jfk95`g_4r6)3#wP*9j-qnRo)|n4cw+Lz@5%7x<*L9>8ev%4rT^s^<<-mm zpUc#8$55jGpo3p&#r-AiGm0u~rfs55{h9gR{w@a(4F6&0{?>0z0S>)zK(y`t`+RY#>S6xN*owDU8&4-dft~7cquNW?^I`Y zE*{<4Q2dcYiLrDIa>vXmFWao}^fd=wbEvYWUszVb9n*d}u9G6(kliyF>By!dI$en4 z*dK^eI~#jEaKLD4I+&S#;v3xB9`c_o)g~n98R+C@=Bqkldm7i1)~k}{q)MHH%9J`d zevEFxi`W^5*fKJ8M_zll#tG>wPP$L(xxRQl(s6~5*iygrJElt$4$3U8OobeTNKF6ek5YfF?VSoS^rWl2PKV%r}o^EZj7?x5S zSNRqfsH=@q!V*WQHl#ujHwsvvC6|QsUlnR|ANU|?;`3{@hUvMzBY2t`Wq*pPa9;_g z`lba6y9?O=^?tMUE=o(dmu#k4xtV%%PzB30F`1K|b*=1Rdb2o+Y?=F)`a*;85_!+cqt zgMU_YZ$n$Zs%3@;kMl1gv+%h?Euj4dkjO`Ai%`7bod5WoBCKo@Hgjyi>EtJll<6hjKh)-s!NH14^A2$LYvFT14;r zCT2m+YVA8es`RzLD3j+PmgzaPi*9`!`3^#*I>Z%YzJn9g97%JaocJYOJm0nJXz1W^Vgx@=~7 z45e+I__9)0BR9vdxUQ`CZNCZEpfiWt{Ye*rr)L#!Xq7rQA7#e{)~f`W)?{D4G$<8_ z=6RXW=Au2}!|;^qODUdskm|SIb+i<20m?TRepnM-b`!6K3O|2z6J+xjVDyked~z=3 zt%aIV>GNN(45w3nec=|Lz!1719LjApXhL+NTl;$4-TBt|p@#AH#ILC>c9A!If9)16 zxCt%#u5Ax<^3`<34M!Ys7_i#1Z_`b7vg%*m;`U(9LWysy7Uy{(z6!S@bhAp`8dP$R z_7n5QGbOz(`_0*Ot`rA433;$$_*P~T}iI#{wIR^haO@{k=EOk+1mD_*UvI7yXmSY!$+vm1d@=K?;o$ zy2Tr>y9W4(!4_%T6-VKk@kn&@#4;lJgMYH8w$F?3x~W0)eLsqr@3z9rjl!vpui&u= zL&{Y>f3ka33tqU#LLl?F?Yy)SE2BjzpO|aA>Tl&la91z8->V&9FyXMQcUygP<|cZ@ z6GDu!;g#mou)afA>)8h}5~dylEzySeQ2O5S%-3l}oAnp)HDwe03EK4vGT<_Hr?RvQ zsb|$`cjA*Q_!ugf(lP7jdUPAh_Xi}t%zdw$KwsyHla*=7T>XZ*-1F{(LX&yApA~=Z zKH1rF612J2!GY_q&|U4|r@4DEqqHQ+u?H1ki1Ete)qP*Q(8U@aMln@W-9ml&B?LDg zB=bS6m7B;`I98@u--)cZ^`>;$;@#@|o|>?W7^hcwIh3&Yk*XkhBL&-)plmlx9-na4nrUHV0gs*9no7`Ss#Y;nV%*`9F^LYiTjxJm8TjmWjAOQGj1oRDWyK?I zWrM(wUqQdKor~J6dnw%N&;BtQbyNI}t{ysgUVv&u>UobJY9=?CUP%_5wkQAZS zy3kxV>LMY|yh0oI8K~4R{p=8J)HgvE|E}tj0X*#XrgPVD|H_`FkmjQowzwLZ8>-EQ z)X76lkB)ntpGw=rIqg>{F0&dovwHOkZ!9kk&du(M{liXBXmSzoC8EBQOHHmWu zk3{EM3VV6}{3vQ#9jS$thxdoHim(;Ul%oWHT|Ei)RXBREc&<(e*&CSu$U!;2XT4f9 zN2k?PQv!&|g1oEuI;9+S+a2SBo!4%(9qqzq+oJ17I;&ezjxs)x*%$bnyl&2!p|noT zp@q*ruH$*5;1Ltnbn?%I&We{qF(ng(6A_wMg-%uPl-8{d6gnK@9X@#TwA0m8g%(gb zU1CpyUBO8QFPb7x*v?HDsVGI`enPl@rPbtHPw)HV;Onvx8htT@ZI!Gw5|xJ@>7ja`+Ya& zJak=9$d%=g*x(IoYQ8rDz%?$(!8wJaekT%yNQE{Xv8^Luf!Rv1UP3of=%#kPkaA&u z8>anYf{@W157ZR{14*f+K@=%D(+HDnE+3EHUh_?l9hm9$S)UHjY1vg^J6QEd4HeyR;|0pIrZF*ViM+wL;2j+3rSWIz%6- zq(A+u_MfsB@HB@82(5PObQ)N3wH)LHCRt@XbkW@hmDqIe0M#9DtlB@pNFXg?R>t37_z zJcF`1Z$IHl(~q;sZg@MB`Cl^%upi@pd*vU?vhme0`QH{N&(fGxnT-(qGKpAs#1aas z24ki&(r2Owj;Rwzipk=5h6#rdxu(P|?{CtSdAZ!kU}s6C)J)LXsLhln!vw#%Pqe^% z>@>Ix`j_0}Juc%6#tHWt!8?CzmIN|R$O!+H$1Qj$&3ZC)@$auL*zW9F(Tpw>O5LI2 znqk>I~KE3kbU~Uo^S=^AkBw$Kta?c`LG}&8vvmJ6d|P6f&>iU z_}_^o*%;sp@bCZn9SjgNa>t6b`-s$T!Z-l!Qc6ZxCTcJ} oOok791Mo0_(2#m1oC6Ala|lU>+?VOZTA(Zd!1?qFKPmSA0EX;ckN^Mx literal 0 HcmV?d00001 diff --git a/styles/fonts/font3336.woff2 b/styles/fonts/font3336.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..f8cab46b8cd7bcb7849578868374e95a88dc08b8 GIT binary patch literal 1748 zcmV;_1}ph@Pew8T0RR9100z_m4*&oF01oT`00w#h0RR9100000000000000000000 z0000#Mn+Uk92y=5Rse#25eN#AOpa9x8~_0}0we<>1Rw>25(jV>Bp4zaP7KJ7!*uH- z10yNt*XVwFH|xEb$xO%)nue76E?v74`X;$QxECh!1%wzu;DZ#d%s z;{ZQkCutF!psNJ-*M6<;KevvY#0!x~Xr#)%-E&9G+rNZ(60esCQA{F3C?rC)&?qgk zRA-$GR4Qxt*Aw;x00aQ{@~hoh8ZN%lh;N<~fag63L^&Y_fB?W0@BkS#UP7(|!1v^E z{DU1i00^amb#e4FU3M))&_vkG#7^11M7; zFpM|l$mFWz8UT>|F8O`lR0}&@n<^v4<>E=VWk55N zs@uifx_*)2a*4dmY>$Ph4r6dM25E@Pl+s10L=x+uHs;nH(u?JaCcqxXlZ1~W-PtgN zs>jH9O4Fib30;=nq!-IKJq6MUZ`OwB@igIamN_aILOF0{DWJjGD?m9T0uW;61w=VtQc|=hsS1Idi_$USi9}n4B=!ejbtJuqMA&3|(5R9H z&1%uu=y3>JwtTu%7}>gYNFUwO`}LUJL#{eid6Sf6fwfuFK##O&wFFXGT5&^WJXiLb z4Il%6_yPz%+}*;0^iOYmgeU>z6~KbHXU+Z5y(0P4F%lN^xZeXW+1nmr#1n}m66n#2 zm%(%Ba-u|@5WL%ToB4NKcjQav*W2Y&PmS(D`iuKlLh=!QMIbW?e#lkT7FQj|99M-+ ztnzl#rZh-7M>nZg9YK36tJR`}{bC$5&?e*fzbNFE-Se8G3y<~X zmAJIC*(DY7W7-7`%%`hU!**aLEo-xU-Z##rlG1Hq@}EtqrPLOS`P9QGCTO zE_d#!gle&N`DZWk#iCuT?tNY7TA!=ad@s&y)jT)bI#yNfkfvW45Wp(es$P>XewVGK zUmvPj$1J`kHf?y@EG6yOlOMV$LWmG;PQ~ox<){jwsv(l+CW6}ZpubC%+!n#36&O1r z-h<8ARS`-Tg;PRmQAmxXb%7o#G5sVIBP0&`y48>zT`g6p(-KZ}DWzn4g#J_Z^c=Iy z8#8B``G{rT^sV<{3x)Bwb{(QHY`o$dvr5tQiuoO`23GPa9>ZyPDv}$uulB7ny7bBS zElmCmv=6WL?`%pCQDN=g!GW(P&RIRj)nFJl2>x90;Lg4ZLkFic_)V?O;CTx{gf5V$A|Qec zc}5~3uwbusECnyqs~)dm!eeiIwS1aw1?nuC1AP3%4Mmi~ z$VtP)-aw(xTkji0)wXTdx~A=dINyhvI$k!QaaLg}$Uy zAy1x+{uYQt1Sv99kfT5q9jKvXLBG#OgSJhBHBWb`%|?VLji)306NDWc8X6v+th`xp qv)2M%{zmL~07t;(e+K9W{_V#~Y-9SZw%rl{`f0s!eNEGDCIA4Rd^+a< literal 0 HcmV?d00001 diff --git a/styles/fonts/main-fonts.svg b/styles/fonts/main-fonts.svg new file mode 100644 index 000000000..e45807dd4 --- /dev/null +++ b/styles/fonts/main-fonts.svg @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/styles/scss/main.scss b/styles/scss/main.scss index d7d1a324b..c8d5ce098 100644 --- a/styles/scss/main.scss +++ b/styles/scss/main.scss @@ -39,6 +39,22 @@ $tagBg: #804f7b; $secColor: $tagBg; $imageCompDim: 50px; +$fontPath: '../fonts'; +$fontName: 'main-fonts'; +$fontV: '1'; + +@font-face { + font-family: 'font3336'; + src: url('#{$fontPath}/#{$fontName}.eot?v=#{$fontV}'); + src: url('#{$fontPath}/#{$fontName}.woff?v=#{$fontV}') format('woff'), + //url('#{$fontPath}/#{$fontName}.woff2?v=#{$fontV}') format('woff2'), + url('#{$fontPath}/#{$fontName}.ttf?v=#{$fontV}') format('truetype'), + url('#{$fontPath}/#{$fontName}.svg?v=#{$fontV}') format('svg'), + url('#{$fontPath}/#{$fontName}.eot?v=#{$fontV}') format('embedded-opentype'); + font-weight: normal; + font-style: normal; +} + @mixin user-select($v) { -moz-user-select: $v; -khtml-user-select: $v; @@ -60,6 +76,29 @@ $imageCompDim: 50px; appearance: $v; } +.#{$app-prefix}fonts{ +} +.#{$app-prefix}fonts:before{ + display: block; + font: normal normal normal 14px font3336; // shortening font declaration + font-size: inherit; // can't have font-size inherit on line above, so need to override + text-rendering: auto; // optimizelegibility throws things off #1094 + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-size: 5em; +} +.#{$app-prefix}f-b1:before { content: 'q'; } +.#{$app-prefix}f-b2:before { content: 'w'; } +.#{$app-prefix}f-b3:before { content: 'e'; } +.#{$app-prefix}f-b37:before { content: 'r'; } +.#{$app-prefix}f-hero:before { content: 't'; } +.#{$app-prefix}f-h1p:before { content: 'y'; } +.#{$app-prefix}f-3ba:before { content: 'u'; } +.#{$app-prefix}f-image:before { content: 'i'; } +.#{$app-prefix}f-text:before { content: 'o'; } +.#{$app-prefix}f-quo:before { content: 'p'; } + + .#{$app-prefix}invis-invis, .#{$app-prefix}no-app{ background-color: transparent; border: none; @@ -998,9 +1037,14 @@ $arrowColor: $mainLhlColor; /*b1b1b1*/ width: 45%; padding: 1em; box-sizing: border-box; - height: 100px; + height: 90px; cursor:all-scroll; margin: 2.5%; + font-size: 11px; + font-weight: lighter; + display: flex; + flex-direction: column; + justify-content: flex-end; } .#{$app-prefix}block.#{$app-prefix}bdrag{