fonts & ligatures

4 files changed, 24 insertions, 26 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index bf488ff9..86612dc4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,6 +4,7 @@ module.exports = function (grunt) {
   grunt.initConfig({
     appDir: 'app/Resources/static',
     buildDir: 'web/bundles/wallabagcore',
+    modulesDir: 'node_modules',
 
     postcss: {
       material: {
@@ -111,13 +112,13 @@ module.exports = function (grunt) {
     copy: {
       pickerjs: {
         expand: true,
-        cwd: 'node_modules/pickadate/lib',
+        cwd: '<%= modulesDir %>/pickadate/lib',
         src: 'picker.js',
         dest: '<%= buildDir %>',
       },
       annotator: {
         expand: true,
-        cwd: 'node_modules/annotator/pkg',
+        cwd: '<%= modulesDir %>/annotator/pkg',
         src: 'annotator.min.js',
         dest: '<%= buildDir %>/themes/_global/js/',
       },
@@ -128,14 +129,21 @@ module.exports = function (grunt) {
           {
             expand: true,
             overwrite: true,
-            cwd: '<%= appDir %>/lib/icomoon-bower/',
-            src: 'fonts',
-            dest: '<%= buildDir %>/themes/baggy/',
+            cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
+            src: 'IcoMoon-Free.ttf',
+            dest: '<%= buildDir %>/themes/baggy/fonts/',
+          },
+          {
+            expand: true,
+            overwrite: true,
+            cwd: '<%= modulesDir %>/ptsans-npm-webfont/fonts',
+            src: '*',
+            dest: '<%= buildDir %>/themes/baggy/fonts/',
           },
           {
             expand: true,
             overwrite: true,
-            cwd: '<%= appDir %>/lib/bower-pt-sans/fonts',
+            cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
             src: '*',
             dest: '<%= buildDir %>/themes/baggy/fonts/',
           },
@@ -146,28 +154,28 @@ module.exports = function (grunt) {
           {
             expand: true,
             overwrite: true,
-            cwd: '<%= appDir %>/lib/icomoon-bower/',
-            src: 'fonts',
-            dest: '<%= buildDir %>/themes/material/',
+            cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
+            src: 'IcoMoon-Free.ttf',
+            dest: '<%= buildDir %>/themes/material/fonts',
           },
           {
             expand: true,
             overwrite: true,
-            cwd: 'node_modules/materialize-css/',
+            cwd: '<%= modulesDir %>/materialize-css/',
             src: 'font',
             dest: '<%= buildDir %>/themes/material',
           },
           {
             expand: true,
             overwrite: true,
-            cwd: '<%= appDir %>/lib/roboto-fontface/fonts/',
+            cwd: '<%= modulesDir %>/roboto-fontface/fonts/Roboto',
             src: '*',
-            dest: '<%= buildDir %>/themes/material/fonts/roboto/',
+            dest: '<%= buildDir %>/themes/material/fonts/',
           },
           {
             expand: true,
             overwrite: true,
-            cwd: '<%= appDir %>/lib/material-design-icons-iconfont/dist/fonts/',
+            cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
             src: '*',
             dest: '<%= buildDir %>/themes/material/fonts/',
           },
diff --git a/app/Resources/static/themes/baggy/css/font.css b/app/Resources/static/themes/baggy/css/font.css
index cae7904a..47edcb83 100755
--- a/app/Resources/static/themes/baggy/css/font.css
+++ b/app/Resources/static/themes/baggy/css/font.css
@@ -2,5 +2,5 @@
   font-family: "PT Sans";
   font-style: normal;
   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");
 }
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css
index 58f0eb82..eeedd277 100755
--- a/app/Resources/static/themes/baggy/css/main.css
+++ b/app/Resources/static/themes/baggy/css/main.css
@@ -732,12 +732,7 @@ a.add-to-wallabag-link-after::after {
 
 @font-face {
   font-family: icomoon;
-  src: url("../fonts/icomoon.eot?-s0mcsx");
-  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");
+  src: url("../fonts/IcoMoon-Free.ttf");
   font-weight: normal;
   font-style: normal;
 }
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 1d14448f..67be1d22 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -19,12 +19,7 @@
 
 @font-face {
   font-family: icomoon;
-  src: url("../fonts/icomoon.eot");
-  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");
+  src: url("../fonts/IcoMoon-Free.ttf");
   font-weight: normal;
   font-style: normal;
 }