devol
/
wallabag
mirror of https://github.com/wallabag/wallabag.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fonts & ligatures

This commit is contained in:
Thomas Citharel 2016-09-29 09:18:46 +02:00
parent 8f234d0156
commit 0471e905b8
No known key found for this signature in database
GPG Key ID: 5780691F5FE48FB5
4 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Gruntfile.js
View File

@ -4,6 +4,7 @@ module.exports = function (grunt) {
grunt.initConfig({ grunt.initConfig({
appDir: 'app/Resources/static', appDir: 'app/Resources/static',
buildDir: 'web/bundles/wallabagcore', buildDir: 'web/bundles/wallabagcore',
modulesDir: 'node_modules',
postcss: { postcss: {
material: { material: {
@ -111,13 +112,13 @@ module.exports = function (grunt) {
copy: { copy: {
pickerjs: { pickerjs: {
expand: true, expand: true,
cwd: 'node_modules/pickadate/lib', cwd: '<%= modulesDir %>/pickadate/lib',
src: 'picker.js', src: 'picker.js',
dest: '<%= buildDir %>', dest: '<%= buildDir %>',
}, },
annotator: { annotator: {
expand: true, expand: true,
cwd: 'node_modules/annotator/pkg', cwd: '<%= modulesDir %>/annotator/pkg',
src: 'annotator.min.js', src: 'annotator.min.js',
dest: '<%= buildDir %>/themes/_global/js/', dest: '<%= buildDir %>/themes/_global/js/',
}, },
@ -128,14 +129,21 @@ module.exports = function (grunt) {
{ {
expand: true, expand: true,
overwrite: true, overwrite: true,
cwd: '<%= appDir %>/lib/icomoon-bower/', cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
src: 'fonts', src: 'IcoMoon-Free.ttf',
dest: '<%= buildDir %>/themes/baggy/', dest: '<%= buildDir %>/themes/baggy/fonts/',
}, },
{ {
expand: true, expand: true,
overwrite: true, overwrite: true,
cwd: '<%= appDir %>/lib/bower-pt-sans/fonts', cwd: '<%= modulesDir %>/ptsans-npm-webfont/fonts',
src: '*',
dest: '<%= buildDir %>/themes/baggy/fonts/',
},
{
expand: true,
overwrite: true,
cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
src: '*', src: '*',
dest: '<%= buildDir %>/themes/baggy/fonts/', dest: '<%= buildDir %>/themes/baggy/fonts/',
}, },
@ -146,28 +154,28 @@ module.exports = function (grunt) {
{ {
expand: true, expand: true,
overwrite: true, overwrite: true,
cwd: '<%= appDir %>/lib/icomoon-bower/', cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
src: 'fonts', src: 'IcoMoon-Free.ttf',
dest: '<%= buildDir %>/themes/material/', dest: '<%= buildDir %>/themes/material/fonts',
}, },
{ {
expand: true, expand: true,
overwrite: true, overwrite: true,
cwd: 'node_modules/materialize-css/', cwd: '<%= modulesDir %>/materialize-css/',
src: 'font', src: 'font',
dest: '<%= buildDir %>/themes/material', dest: '<%= buildDir %>/themes/material',
}, },
{ {
expand: true, expand: true,
overwrite: true, overwrite: true,
cwd: '<%= appDir %>/lib/roboto-fontface/fonts/', cwd: '<%= modulesDir %>/roboto-fontface/fonts/Roboto',
src: '*', src: '*',
dest: '<%= buildDir %>/themes/material/fonts/roboto/', dest: '<%= buildDir %>/themes/material/fonts/',
}, },
{ {
expand: true, expand: true,
overwrite: true, overwrite: true,
cwd: '<%= appDir %>/lib/material-design-icons-iconfont/dist/fonts/', cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
src: '*', src: '*',
dest: '<%= buildDir %>/themes/material/fonts/', dest: '<%= buildDir %>/themes/material/fonts/',
}, },

2
app/Resources/static/themes/baggy/css/font.css
View File

@ -2,5 +2,5 @@
font-family: "PT Sans"; font-family: "PT Sans";
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
src: local("PT Sans Bold"), local("PTSans-Bold"), url("../fonts/pt_sans/regular/PTS55F.woff") format("woff"); src: local("PT Sans Bold"), local("PTSans-Bold"), url("../fonts/ptsansbold.woff") format("woff");
} }

7
app/Resources/static/themes/baggy/css/main.css
View File

@ -732,12 +732,7 @@ a.add-to-wallabag-link-after::after {
@font-face { @font-face {
font-family: icomoon; font-family: icomoon;
src: url("../fonts/icomoon.eot?-s0mcsx"); src: url("../fonts/IcoMoon-Free.ttf");
src:
url("../fonts/icomoon.eot?#iefix-s0mcsx") format("embedded-opentype"),
url("../fonts/icomoon.woff?-s0mcsx") format("woff"),
url("../fonts/icomoon.ttf?-s0mcsx") format("truetype"),
url("../fonts/icomoon.svg?-s0mcsx#icomoon") format("svg");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

7
app/Resources/static/themes/material/css/main.css
View File

@ -19,12 +19,7 @@
@font-face { @font-face {
font-family: icomoon; font-family: icomoon;
src: url("../fonts/icomoon.eot"); src: url("../fonts/IcoMoon-Free.ttf");
src:
url("../fonts/icomoon.eot#iefix") format("embedded-opentype"),
url("../fonts/icomoon.ttf") format("truetype"),
url("../fonts/icomoon.woff") format("woff"),
url("../fonts/icomoon.svg#icomoon") format("svg");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }