diff --git a/build/banner.js b/build/banner.js index 5b899d503..c1720f251 100644 --- a/build/banner.js +++ b/build/banner.js @@ -7,7 +7,7 @@ function getBanner(pluginFilename) { return `/*! * Tabler${pluginFilename ? ` ${pluginFilename}` : ''} v${pkg.version} (${pkg.homepage}) * Copyright 2018-${year} ${pkg.author} - * Licensed under MIT (https://github.com/twbs/tabler/blob/master/LICENSE) + * Licensed under ${pkg.license} (https://github.com/tabler/tabler/blob/master/LICENSE) */`; } diff --git a/fonts/tabler-webfont/tabler-webfont.eot b/fonts/tabler-webfont/tabler-webfont.eot index 9041e157a..fc7fd5f86 100644 Binary files a/fonts/tabler-webfont/tabler-webfont.eot and b/fonts/tabler-webfont/tabler-webfont.eot differ diff --git a/fonts/tabler-webfont/tabler-webfont.ttf b/fonts/tabler-webfont/tabler-webfont.ttf index 1bbff34c6..5edb6af0c 100644 Binary files a/fonts/tabler-webfont/tabler-webfont.ttf and b/fonts/tabler-webfont/tabler-webfont.ttf differ diff --git a/fonts/tabler-webfont/tabler-webfont.woff b/fonts/tabler-webfont/tabler-webfont.woff index 7f9ecb629..575ea84ca 100644 Binary files a/fonts/tabler-webfont/tabler-webfont.woff and b/fonts/tabler-webfont/tabler-webfont.woff differ diff --git a/fonts/tabler-webfont/tabler-webfont.woff2 b/fonts/tabler-webfont/tabler-webfont.woff2 index ea6f30e1f..22858f829 100644 Binary files a/fonts/tabler-webfont/tabler-webfont.woff2 and b/fonts/tabler-webfont/tabler-webfont.woff2 differ diff --git a/package.json b/package.json index 1c119a0be..2ad633f46 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "js-minify-standalone": "terser --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/tabler.js.map,includeSources,url=tabler.min.js.map\" --output dist/js/tabler.min.js dist/js/tabler.js", "js-minify-bundle": "terser --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/tabler.bundle.js.map,includeSources,url=tabler.bundle.min.js.map\" --output dist/js/tabler.bundle.min.js dist/js/tabler.bundle.js", "svg-svgo": "svgo -f svg/fe --pretty && svgo -f svg/brand --pretty", - "svg-iconfont": "mkdir -p svg-tmp && for i in svg/*/*.svg;do N=`echo $i | sed -e 's/^svg\\///g' | sed -e 's/\\\\.svg$//g' | sed -e 's/\\//-/g'`; echo $i; rsvg-convert $i -o svg-tmp/$N.svg -f svg -w 1000; done && svgo ./svg-tmp/*.svg --disable={removeViewBox} && icon-font-generator ./svg-tmp/*.svg -o fonts/tabler-webfont --html false --csstp build/tabler-webfont.hbs --csspath scss/fonts/_tabler-webfont.scss --center --normalize --name tabler-webfont --types svg,eot,ttf,woff,woff2 --json false && rm -rf svg-tmp && node build/generate-font-codepoints.js" + "svg-iconfont": "mkdir -p svg-tmp && for i in svg/*/*.svg;do N=`echo $i | sed -e 's/^svg\\///g' | sed -e 's/\\\\.svg$//g' | sed -e 's/\\//-/g'`; echo $i; rsvg-convert $i -o svg-tmp/$N.svg -f svg -w 1000; done && svgo ./svg-tmp/*.svg --disable={removeViewBox} && icon-font-generator ./svg-tmp/*.svg -o fonts/tabler-webfont --html false --cssfontsurl ../fonts/tabler-webfont --csstp build/tabler-webfont.hbs --csspath scss/fonts/_tabler-webfont.scss --center --normalize --name tabler-webfont --types svg,eot,ttf,woff,woff2 --json false && rm -rf svg-tmp && node build/generate-font-codepoints.js" }, "repository": { "type": "git", @@ -39,7 +39,7 @@ }, "keywords": [], "author": "codecalm", - "license": "ISC", + "license": "MIT", "bugs": { "url": "https://github.com/tabler/tabler/issues" }, diff --git a/scss/fonts/_tabler-webfont.scss b/scss/fonts/_tabler-webfont.scss index 6765499bc..62334a643 100644 --- a/scss/fonts/_tabler-webfont.scss +++ b/scss/fonts/_tabler-webfont.scss @@ -1,10 +1,10 @@ @font-face { font-family: 'tabler-webfont'; - src: url("../../fonts/tabler-webfont/tabler-webfont.eot?387a874f70b428df70bf7a58eb19d5f3?#iefix") format("embedded-opentype"), -url("../../fonts/tabler-webfont/tabler-webfont.woff2?387a874f70b428df70bf7a58eb19d5f3") format("woff2"), -url("../../fonts/tabler-webfont/tabler-webfont.woff?387a874f70b428df70bf7a58eb19d5f3") format("woff"), -url("../../fonts/tabler-webfont/tabler-webfont.ttf?387a874f70b428df70bf7a58eb19d5f3") format("truetype"), -url("../../fonts/tabler-webfont/tabler-webfont.svg?387a874f70b428df70bf7a58eb19d5f3#tabler-webfont") format("svg"); + src: url("../fonts/tabler-webfont/tabler-webfont.eot?d88ab45f67181eccbf3579d96bdf650a?#iefix") format("embedded-opentype"), +url("../fonts/tabler-webfont/tabler-webfont.woff2?d88ab45f67181eccbf3579d96bdf650a") format("woff2"), +url("../fonts/tabler-webfont/tabler-webfont.woff?d88ab45f67181eccbf3579d96bdf650a") format("woff"), +url("../fonts/tabler-webfont/tabler-webfont.ttf?d88ab45f67181eccbf3579d96bdf650a") format("truetype"), +url("../fonts/tabler-webfont/tabler-webfont.svg?d88ab45f67181eccbf3579d96bdf650a#tabler-webfont") format("svg"); font-weight: normal; font-style: normal; }