aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2016-09-29 09:18:46 +0200
committerThomas Citharel <tcit@tcit.fr>2016-09-29 09:18:46 +0200
commit0471e905b8b37ac226176ee9a708624c869bb046 (patch)
tree3c4a69502b6d3bfead33caf592d2242261d9b996
parent8f234d0156cc6f2eb6e3c9f692e4633b35fafc41 (diff)
downloadwallabag-0471e905b8b37ac226176ee9a708624c869bb046.tar.gz
wallabag-0471e905b8b37ac226176ee9a708624c869bb046.tar.zst
wallabag-0471e905b8b37ac226176ee9a708624c869bb046.zip
fonts & ligatures
-rw-r--r--Gruntfile.js34
-rwxr-xr-xapp/Resources/static/themes/baggy/css/font.css2
-rwxr-xr-xapp/Resources/static/themes/baggy/css/main.css7
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css7
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) {
4 grunt.initConfig({ 4 grunt.initConfig({
5 appDir: 'app/Resources/static', 5 appDir: 'app/Resources/static',
6 buildDir: 'web/bundles/wallabagcore', 6 buildDir: 'web/bundles/wallabagcore',
7 modulesDir: 'node_modules',
7 8
8 postcss: { 9 postcss: {
9 material: { 10 material: {
@@ -111,13 +112,13 @@ module.exports = function (grunt) {
111 copy: { 112 copy: {
112 pickerjs: { 113 pickerjs: {
113 expand: true, 114 expand: true,
114 cwd: 'node_modules/pickadate/lib', 115 cwd: '<%= modulesDir %>/pickadate/lib',
115 src: 'picker.js', 116 src: 'picker.js',
116 dest: '<%= buildDir %>', 117 dest: '<%= buildDir %>',
117 }, 118 },
118 annotator: { 119 annotator: {
119 expand: true, 120 expand: true,
120 cwd: 'node_modules/annotator/pkg', 121 cwd: '<%= modulesDir %>/annotator/pkg',
121 src: 'annotator.min.js', 122 src: 'annotator.min.js',
122 dest: '<%= buildDir %>/themes/_global/js/', 123 dest: '<%= buildDir %>/themes/_global/js/',
123 }, 124 },
@@ -128,14 +129,21 @@ module.exports = function (grunt) {
128 { 129 {
129 expand: true, 130 expand: true,
130 overwrite: true, 131 overwrite: true,
131 cwd: '<%= appDir %>/lib/icomoon-bower/', 132 cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
132 src: 'fonts', 133 src: 'IcoMoon-Free.ttf',
133 dest: '<%= buildDir %>/themes/baggy/', 134 dest: '<%= buildDir %>/themes/baggy/fonts/',
135 },
136 {
137 expand: true,
138 overwrite: true,
139 cwd: '<%= modulesDir %>/ptsans-npm-webfont/fonts',
140 src: '*',
141 dest: '<%= buildDir %>/themes/baggy/fonts/',
134 }, 142 },
135 { 143 {
136 expand: true, 144 expand: true,
137 overwrite: true, 145 overwrite: true,
138 cwd: '<%= appDir %>/lib/bower-pt-sans/fonts', 146 cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
139 src: '*', 147 src: '*',
140 dest: '<%= buildDir %>/themes/baggy/fonts/', 148 dest: '<%= buildDir %>/themes/baggy/fonts/',
141 }, 149 },
@@ -146,28 +154,28 @@ module.exports = function (grunt) {
146 { 154 {
147 expand: true, 155 expand: true,
148 overwrite: true, 156 overwrite: true,
149 cwd: '<%= appDir %>/lib/icomoon-bower/', 157 cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
150 src: 'fonts', 158 src: 'IcoMoon-Free.ttf',
151 dest: '<%= buildDir %>/themes/material/', 159 dest: '<%= buildDir %>/themes/material/fonts',
152 }, 160 },
153 { 161 {
154 expand: true, 162 expand: true,
155 overwrite: true, 163 overwrite: true,
156 cwd: 'node_modules/materialize-css/', 164 cwd: '<%= modulesDir %>/materialize-css/',
157 src: 'font', 165 src: 'font',
158 dest: '<%= buildDir %>/themes/material', 166 dest: '<%= buildDir %>/themes/material',
159 }, 167 },
160 { 168 {
161 expand: true, 169 expand: true,
162 overwrite: true, 170 overwrite: true,
163 cwd: '<%= appDir %>/lib/roboto-fontface/fonts/', 171 cwd: '<%= modulesDir %>/roboto-fontface/fonts/Roboto',
164 src: '*', 172 src: '*',
165 dest: '<%= buildDir %>/themes/material/fonts/roboto/', 173 dest: '<%= buildDir %>/themes/material/fonts/',
166 }, 174 },
167 { 175 {
168 expand: true, 176 expand: true,
169 overwrite: true, 177 overwrite: true,
170 cwd: '<%= appDir %>/lib/material-design-icons-iconfont/dist/fonts/', 178 cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
171 src: '*', 179 src: '*',
172 dest: '<%= buildDir %>/themes/material/fonts/', 180 dest: '<%= buildDir %>/themes/material/fonts/',
173 }, 181 },
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 @@
2 font-family: "PT Sans"; 2 font-family: "PT Sans";
3 font-style: normal; 3 font-style: normal;
4 font-weight: 700; 4 font-weight: 700;
5 src: local("PT Sans Bold"), local("PTSans-Bold"), url("../fonts/pt_sans/regular/PTS55F.woff") format("woff"); 5 src: local("PT Sans Bold"), local("PTSans-Bold"), url("../fonts/ptsansbold.woff") format("woff");
6} 6}
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 {
732 732
733@font-face { 733@font-face {
734 font-family: icomoon; 734 font-family: icomoon;
735 src: url("../fonts/icomoon.eot?-s0mcsx"); 735 src: url("../fonts/IcoMoon-Free.ttf");
736 src:
737 url("../fonts/icomoon.eot?#iefix-s0mcsx") format("embedded-opentype"),
738 url("../fonts/icomoon.woff?-s0mcsx") format("woff"),
739 url("../fonts/icomoon.ttf?-s0mcsx") format("truetype"),
740 url("../fonts/icomoon.svg?-s0mcsx#icomoon") format("svg");
741 font-weight: normal; 736 font-weight: normal;
742 font-style: normal; 737 font-style: normal;
743} 738}
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 @@
19 19
20@font-face { 20@font-face {
21 font-family: icomoon; 21 font-family: icomoon;
22 src: url("../fonts/icomoon.eot"); 22 src: url("../fonts/IcoMoon-Free.ttf");
23 src:
24 url("../fonts/icomoon.eot#iefix") format("embedded-opentype"),
25 url("../fonts/icomoon.ttf") format("truetype"),
26 url("../fonts/icomoon.woff") format("woff"),
27 url("../fonts/icomoon.svg#icomoon") format("svg");
28 font-weight: normal; 23 font-weight: normal;
29 font-style: normal; 24 font-style: normal;
30} 25}