From 9cad9ad2f9ac1e95933249dd18453a0d45fc6e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= Date: Mon, 27 Apr 2015 14:05:36 +0200 Subject: [PATCH] Replace grunt-fontsmith by front-webfont + new icons --- Gruntfile.js | 29 ++-- front/src/css/icons.css | 65 +++++++- front/src/css/main.css | 157 ++++++++----------- front/src/fonts/icons.woff | Bin 2032 -> 0 bytes front/src/fonts/svg-icons/arrow-left3.svg | 2 +- front/src/fonts/svg-icons/bars.svg | 2 +- front/src/fonts/svg-icons/lab.svg | 2 +- front/src/fonts/svg-icons/list.svg | 2 +- front/src/fonts/svg-icons/loop.svg | 2 +- front/src/fonts/svg-icons/mobile.svg | 1 + front/src/fonts/svg-icons/question.svg | 2 +- front/src/fonts/svg-icons/screen.svg | 1 + front/src/fonts/svg-icons/tablet.svg | 1 + front/src/fonts/svg-icons/warning.svg | 2 +- front/src/less/icons.less | 182 +++++++++++++++------- front/src/less/main.less | 23 --- front/src/views/resultSubHeader.html | 6 +- package.json | 2 +- 18 files changed, 282 insertions(+), 199 deletions(-) delete mode 100644 front/src/fonts/icons.woff create mode 100755 front/src/fonts/svg-icons/mobile.svg create mode 100755 front/src/fonts/svg-icons/screen.svg create mode 100755 front/src/fonts/svg-icons/tablet.svg diff --git a/Gruntfile.js b/Gruntfile.js index bfa9b04..b7c5fea 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -11,17 +11,18 @@ module.exports = function(grunt) { pkg: grunt.file.readJSON('package.json'), settings: grunt.file.readJSON('./server_config/settings.json'), - font: { + webfont: { icons: { - src: ['front/src/fonts/svg-icons/*.svg'], - destCss: 'front/src/less/icons.less', - destFonts: 'front/src/fonts/icons.woff', - - // Optional: Custom routing of font filepaths for CSS - cssRouter: function (fontpath) { - var pathArray = fontpath.split('/'); - var fileName = pathArray[pathArray.length - 1]; - return '/fonts/' + fileName; + src: 'front/src/fonts/svg-icons/*.svg', + dest: 'tmp', + destCss: 'front/src/less', + options: { + engine: 'node', + types: 'woff', + stylesheet: 'less', + embed: true, + htmlDemo: false, + syntax: 'bootstrap' } } }, @@ -102,7 +103,6 @@ module.exports = function(grunt) { }, build: { files: [ - {src: ['./front/src/fonts/icons.woff'], dest: './front/build/fonts/icons.woff'}, {src: ['./front/src/img/favicon.png'], dest: './front/build/img/favicon.png'}, {src: ['./front/src/img/logo-large.png'], dest: './front/build/img/logo-large.png'}, ] @@ -211,10 +211,7 @@ module.exports = function(grunt) { html: './front/build/main.html', css: './front/build/css/*.css', options: { - assetsDirs: ['front/build'], - patterns: { - css: [[/(\/fonts\/icons\.woff)/gm, 'Replacing reference to icons.woff']] - } + assetsDirs: ['front/build'] } }, htmlmin: { @@ -294,7 +291,7 @@ module.exports = function(grunt) { grunt.registerTask('icons', [ - 'font:icons', + 'webfont:icons', 'less', 'clean:tmp' ]); diff --git a/front/src/css/icons.css b/front/src/css/icons.css index ac51e0c..fc67b26 100644 --- a/front/src/css/icons.css +++ b/front/src/css/icons.css @@ -1,6 +1,67 @@ @font-face { - font-family: "fontsmith-icons"; - src: url("/fonts/icons.woff") format("woff"); + font-family: "icons"; + src: url("data:application/x-font-woff;charset=utf-8;base64,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") format("woff"); font-weight: normal; font-style: normal; } +[class^="icon-"]:before, +[class*=" icon-"]:before { + font-family: "icons"; + display: inline-block; + vertical-align: middle; + line-height: 1; + font-weight: normal; + font-style: normal; + speak: none; + text-decoration: inherit; + text-transform: none; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +.icon-arrow-left3:before, +.icon-bars:before, +.icon-lab:before, +.icon-list:before, +.icon-loop:before, +.icon-mobile:before, +.icon-question:before, +.icon-screen:before, +.icon-tablet:before, +.icon-warning:before { + font-family: "icons"; + display: inline-block; + font-weight: normal; + font-style: normal; + text-decoration: inherit; +} +.icon-arrow-left3:before { + content: "\f101"; +} +.icon-bars:before { + content: "\f102"; +} +.icon-lab:before { + content: "\f103"; +} +.icon-list:before { + content: "\f104"; +} +.icon-loop:before { + content: "\f105"; +} +.icon-mobile:before { + content: "\f106"; +} +.icon-question:before { + content: "\f107"; +} +.icon-screen:before { + content: "\f108"; +} +.icon-tablet:before { + content: "\f109"; +} +.icon-warning:before { + content: "\f10a"; +} diff --git a/front/src/css/main.css b/front/src/css/main.css index dea34f0..46ef10a 100644 --- a/front/src/css/main.css +++ b/front/src/css/main.css @@ -1,9 +1,70 @@ @font-face { - font-family: "fontsmith-icons"; - src: url("/fonts/icons.woff") format("woff"); + font-family: "icons"; + src: url("data:application/x-font-woff;charset=utf-8;base64,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") format("woff"); font-weight: normal; font-style: normal; } +[class^="icon-"]:before, +[class*=" icon-"]:before { + font-family: "icons"; + display: inline-block; + vertical-align: middle; + line-height: 1; + font-weight: normal; + font-style: normal; + speak: none; + text-decoration: inherit; + text-transform: none; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +.icon-arrow-left3:before, +.icon-bars:before, +.icon-lab:before, +.icon-list:before, +.icon-loop:before, +.icon-mobile:before, +.icon-question:before, +.icon-screen:before, +.icon-tablet:before, +.icon-warning:before { + font-family: "icons"; + display: inline-block; + font-weight: normal; + font-style: normal; + text-decoration: inherit; +} +.icon-arrow-left3:before { + content: "\f101"; +} +.icon-bars:before { + content: "\f102"; +} +.icon-lab:before { + content: "\f103"; +} +.icon-list:before { + content: "\f104"; +} +.icon-loop:before { + content: "\f105"; +} +.icon-mobile:before { + content: "\f106"; +} +.icon-question:before { + content: "\f107"; +} +.icon-screen:before { + content: "\f108"; +} +.icon-tablet:before { + content: "\f109"; +} +.icon-warning:before { + content: "\f10a"; +} html { margin: 100px 50px; } @@ -179,95 +240,3 @@ a.linkButton { .footer .version { font-size: 0.7em; } -/* Icons */ -.icon-lab { - font-family: "fontsmith-icons"; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; -} -.icon-lab:before { - content: "\e004"; -} -.icon-question { - font-family: "fontsmith-icons"; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; -} -.icon-question:before { - content: "\e001"; -} -.icon-warning { - font-family: "fontsmith-icons"; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; -} -.icon-warning:before { - content: "\e000"; -} -.icon-back { - font-family: "fontsmith-icons"; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; -} -.icon-back:before { - content: "\e006"; -} -.icon-summary { - font-family: "fontsmith-icons"; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; -} -.icon-summary:before { - content: "\e003"; -} -.icon-spaghetti { - font-family: "fontsmith-icons"; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; -} -.icon-spaghetti:before { - content: "\e005"; -} -.icon-loop { - font-family: "fontsmith-icons"; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; -} -.icon-loop:before { - content: "\e002"; -} diff --git a/front/src/fonts/icons.woff b/front/src/fonts/icons.woff deleted file mode 100644 index 9611c2f172f165dae7438ce9e409dc2b02a311d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2032 zcmZXVdoW!#QiD5|4~IW;bItc*yh9OqZ>yWW4^z1DZ__5D20dY)&mz1H4bCl<@e-Q5WQ zNimQD@RHU8i0}LVFD8pc0sw&l0QCsYKbkl6*KHQd-2s3tPvLAOSVYcTT&2x{gDjYd zVXp#<1WW+R$<5FR05l%$(aFABMw%*+DQXhM55@6N!Gg z>@XO@4DJb3VQHZ7o1!pIEDvUju$P5JK*2kQ&4cSn!WN)^2dQ!83zNxJO!~ z_v6**s1va;6TwUx76~8$;1$PtB-`f&6F1xYHh30MeYm9yVqrh^{sgLxe25?+^Nr!0 ztDNktNA}vO6O`XFm6wyslfPzB7_ysHs5y~?*3rCcPK*ofzG(H5&?~43VwQ*!;sy7Y zR@%9SjbV32S2orYtwukcZXd;#KT9QH0(yr$5^8JLQp*vDdWq~~5{G0{y!DL_Qgcl@ zG1>Bcq`+Fph~|#=m53~nX(4lfi%GKr2bt@TY>2*)h?7-kZ|Pxf*XTaQ+gi_FDN4}& z;O6FbY``r)Zm{0phdB7!{VFXu-l#|4UY1@X_wMYcv*;9TU-}zs^1dG3aDhfp#Ci4U ztc5X?h_9=-A|C<2gzt(Qz=~Vi*Ott8i<_u!Vq&2;^O>=#FL_ww2fsA2j&P8NLwTm1G&=;>uTMlq! zTDEG0R#`qcwV7j1WZK7XY=xf2&-hCAew*CnsZ;WDw6+m+pS9l=s`LKUm;x#s1YY5Ip~_YGBK zX}suE{6N%7;ycg^T^628S3Isfc0(?*$ZpnoIJK@kYi(+3=}JobV%ViJgU2g2@8Xv0|LUSR=TE8hdN(pA z-ene(@MW9xFW<6m%SIL!F^aWs+ISycWVJroU4&vU`ao;9x=d_vTH_0s+qUF$op;MZ&t&p;N*>0ABE zzul|5&+1r;)m+ywyx%PzqXgKL^pV9%hlttC3VGLE@yVK+thy=J&O73 z5|cCWZ1Uu}<)2QNh1G8Sacqp}hE9B)vwK0YwXupf)Cd5c_a@^PWg+@`ovBCIOCW+C}!$-lmLM3Betrn#6m zI331|A6Fcqc@DJiVoLHErZV{zE&oqz6+{w8yS8HMs(3@3&$>rF*^=P&!J5RUKt8On~QB{)Yr-s3vdUQ;h z!k6YR4jHnW@2j(QZp4ZmXVugSIL=REK(Y$@#O>icbZ?Ch%d zwU3PhwjG{B3^Jy7_2uH%=0ab$X`+PBET}~)(Bt$boa4l_ul3~zE3LZglfmU{Lk_&+ zKnQ|@K&o+5)=1idl$Vh)n+BXXl40N9xj-lgf`rHbEE*35Kq%{Nq!7dk0iY^@1^gI( zkB0<6#R9>gpmU-7+V28^a9dS}k*!f9l}g=x$H-Wa0#XO?m*)z*gyJ)QB9U*>HgSYi zf*Mtu24{5b&;~on0B`@z=2sz{% zBq=`)p(g`~KX2v#?`(qo?- zPmyQtn)pmOuil#JcxNi^rzrlByDaEwrX=loZ#>&=mY=j+l{z=c)86nJ(NjAV|L#WJ zlw1ellaI6F{MhL4$kKHq)qihR1T%xG&o5TI>N#>Dl`A1bY5MI@IP=8Ix-CN^+{O1A zHUbwno#EYH8#CPT5P6=5e*V0J-Rr-bFWkh|8R(jFuj&-;Xs^*V9Bs?y%NLj}Y$ymH dMtkm5@#Twy \ No newline at end of file + \ No newline at end of file diff --git a/front/src/fonts/svg-icons/bars.svg b/front/src/fonts/svg-icons/bars.svg index 2e7adca..f491fb9 100644 --- a/front/src/fonts/svg-icons/bars.svg +++ b/front/src/fonts/svg-icons/bars.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/front/src/fonts/svg-icons/lab.svg b/front/src/fonts/svg-icons/lab.svg index 28b3aa8..ab42c55 100644 --- a/front/src/fonts/svg-icons/lab.svg +++ b/front/src/fonts/svg-icons/lab.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/front/src/fonts/svg-icons/list.svg b/front/src/fonts/svg-icons/list.svg index 403a80a..da0a00b 100644 --- a/front/src/fonts/svg-icons/list.svg +++ b/front/src/fonts/svg-icons/list.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/front/src/fonts/svg-icons/loop.svg b/front/src/fonts/svg-icons/loop.svg index 11e65f9..17a0bba 100755 --- a/front/src/fonts/svg-icons/loop.svg +++ b/front/src/fonts/svg-icons/loop.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/front/src/fonts/svg-icons/mobile.svg b/front/src/fonts/svg-icons/mobile.svg new file mode 100755 index 0000000..5136a81 --- /dev/null +++ b/front/src/fonts/svg-icons/mobile.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/fonts/svg-icons/question.svg b/front/src/fonts/svg-icons/question.svg index 49e9fc3..7f447ee 100644 --- a/front/src/fonts/svg-icons/question.svg +++ b/front/src/fonts/svg-icons/question.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/front/src/fonts/svg-icons/screen.svg b/front/src/fonts/svg-icons/screen.svg new file mode 100755 index 0000000..eb2048c --- /dev/null +++ b/front/src/fonts/svg-icons/screen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/fonts/svg-icons/tablet.svg b/front/src/fonts/svg-icons/tablet.svg new file mode 100755 index 0000000..45f83ab --- /dev/null +++ b/front/src/fonts/svg-icons/tablet.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/fonts/svg-icons/warning.svg b/front/src/fonts/svg-icons/warning.svg index 85f8300..6cfed51 100644 --- a/front/src/fonts/svg-icons/warning.svg +++ b/front/src/fonts/svg-icons/warning.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/front/src/less/icons.less b/front/src/less/icons.less index 7603317..860ed7d 100644 --- a/front/src/less/icons.less +++ b/front/src/less/icons.less @@ -1,56 +1,132 @@ -@warning-font-family: "fontsmith-icons"; -@warning-value: "\e000"; -@warning: '"fontsmith-icons"' '"\\e000"'; -@question-font-family: "fontsmith-icons"; -@question-value: "\e001"; -@question: '"fontsmith-icons"' '"\\e001"'; -@lab-font-family: "fontsmith-icons"; -@lab-value: "\e004"; -@lab: '"fontsmith-icons"' '"\\e004"'; -@list-font-family: "fontsmith-icons"; -@list-value: "\e003"; -@list: '"fontsmith-icons"' '"\\e003"'; -@bars-font-family: "fontsmith-icons"; -@bars-value: "\e005"; -@bars: '"fontsmith-icons"' '"\\e005"'; -@arrow-left3-font-family: "fontsmith-icons"; -@arrow-left3-value: "\e006"; -@arrow-left3: '"fontsmith-icons"' '"\\e006"'; -@loop-font-family: "fontsmith-icons"; -@loop-value: "\e002"; -@loop: '"fontsmith-icons"' '"\\e002"'; +// Generated by grunt-webfont +// Based on https://github.com/endtwist/fontcustom/blob/master/lib/fontcustom/templates/fontcustom.css -.icon-font-family(@char) { - font-family: ~`@{char}[0]`; -} - -.icon-font() { - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; -} - -.icon-content(@char) { - content: ~`@{char}[1]`; -} - -.icon(@char) { - .icon-font-family(@char); - .icon-font(); - - &:before { - .icon-content(@char); - } -} @font-face { - font-family: "fontsmith-icons"; - src:url("/fonts/icons.woff") format("woff"), - ; - font-weight: normal; - font-style: normal; -} \ No newline at end of file + font-family:"icons"; + src:url("data:application/x-font-woff;charset=utf-8;base64,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") format("woff"); + font-weight:normal; + font-style:normal; +} + + +// Bootstrap Overrides +[class^="icon-"]:before, +[class*=" icon-"]:before { + font-family:"icons"; + display:inline-block; + vertical-align:middle; + line-height:1; + font-weight:normal; + font-style:normal; + speak:none; + text-decoration:inherit; + text-transform:none; + text-rendering:optimizeLegibility; + -webkit-font-smoothing:antialiased; + -moz-osx-font-smoothing:grayscale; +} + +// Mixins + +.icon-arrow-left3, +.icon-bars, +.icon-lab, +.icon-list, +.icon-loop, +.icon-mobile, +.icon-question, +.icon-screen, +.icon-tablet, +.icon-warning { + &:before { + font-family:"icons"; + display:inline-block; + font-weight:normal; + font-style:normal; + text-decoration:inherit; + } +} + + +// Icons + +.icon-arrow-left3 { + &:before { + content:"\f101"; + } + +} + + +.icon-bars { + &:before { + content:"\f102"; + } + +} + + +.icon-lab { + &:before { + content:"\f103"; + } + +} + + +.icon-list { + &:before { + content:"\f104"; + } + +} + + +.icon-loop { + &:before { + content:"\f105"; + } + +} + + +.icon-mobile { + &:before { + content:"\f106"; + } + +} + + +.icon-question { + &:before { + content:"\f107"; + } + +} + + +.icon-screen { + &:before { + content:"\f108"; + } + +} + + +.icon-tablet { + &:before { + content:"\f109"; + } + +} + + +.icon-warning { + &:before { + content:"\f10a"; + } + +} + diff --git a/front/src/less/main.less b/front/src/less/main.less index a22bb81..78773fa 100644 --- a/front/src/less/main.less +++ b/front/src/less/main.less @@ -186,27 +186,4 @@ a.linkButton { .version { font-size: 0.7em; } -} - -/* Icons */ -.icon-lab { - .icon(@lab); -} -.icon-question { - .icon(@question); -} -.icon-warning { - .icon(@warning); -} -.icon-back { - .icon(@arrow-left3); -} -.icon-summary { - .icon(@list); -} -.icon-spaghetti { - .icon(@bars); -} -.icon-loop { - .icon(@loop); } \ No newline at end of file diff --git a/front/src/views/resultSubHeader.html b/front/src/views/resultSubHeader.html index af20dd5..d004253 100644 --- a/front/src/views/resultSubHeader.html +++ b/front/src/views/resultSubHeader.html @@ -1,8 +1,8 @@
Tested url:   {{result.params.url}}
-
New test +
New test
Test again -
Dashboard
-
JS Timeline
+
Dashboard
+
JS Timeline
\ No newline at end of file diff --git a/package.json b/package.json index 601d1bf..8af9a0c 100644 --- a/package.json +++ b/package.json @@ -40,12 +40,12 @@ "grunt-env": "^0.4.4", "grunt-express": "^1.4.1", "grunt-filerev": "^2.1.2", - "grunt-fontsmith": "^0.9.1", "grunt-inline-angular-templates": "^0.1.5", "grunt-line-remover": "^0.0.2", "grunt-mocha-test": "^0.12.7", "grunt-replace": "^0.8.0", "grunt-usemin": "^3.0.0", + "grunt-webfont": "^0.5.2", "matchdep": "^0.3.0", "mocha": "^2.2.1", "request": "^2.53.0",