Skip to content

Commit 692a60a

Browse files
author
Pooya Parsa
committed
fix(icons): use font-display: optional
1 parent abe70fc commit 692a60a

13 files changed

+45
-13
lines changed

Diff for: lib/assets/icons/fonts/Framework7Icons-Regular.eot

50.1 KB
Binary file not shown.

Diff for: lib/assets/icons/fonts/Framework7Icons-Regular.ttf

49.9 KB
Binary file not shown.

Diff for: lib/assets/icons/fonts/Framework7Icons-Regular.woff

25.3 KB
Binary file not shown.

Diff for: lib/assets/icons/fonts/Framework7Icons-Regular.woff2

19.9 KB
Binary file not shown.

Diff for: lib/assets/icons/framework7-icons.css

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
@font-face {
2+
font-family: 'Framework7 Icons';
3+
font-style: normal;
4+
font-display: optional;
5+
font-weight: 400;
6+
src: url(./fonts/Framework7Icons-Regular.eot);
7+
src: local('Framework7 Icons'),
8+
local('Framework7Icons-Regular'),
9+
url(./fonts/Framework7Icons-Regular.woff2) format("woff2"),
10+
url(./fonts/Framework7Icons-Regular.woff) format("woff"),
11+
url(./fonts/Framework7Icons-Regular.ttf) format("truetype");
12+
}
13+
14+
.f7-icons, .framework7-icons {
15+
font-family: 'Framework7 Icons';
16+
font-weight: normal;
17+
font-style: normal;
18+
font-size: 25px;
19+
line-height: 1;
20+
letter-spacing: normal;
21+
text-transform: none;
22+
display: inline-block;
23+
white-space: nowrap;
24+
word-wrap: normal;
25+
direction: ltr;
26+
-webkit-font-smoothing: antialiased;
27+
text-rendering: optimizeLegibility;
28+
-moz-osx-font-smoothing: grayscale;
29+
-webkit-font-feature-settings: "liga";
30+
-moz-font-feature-settings: "liga=1";
31+
-moz-font-feature-settings: "liga";
32+
font-feature-settings: "liga";
33+
text-align: center;
34+
}
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
@font-face {
22
font-family: 'Material Icons';
33
font-style: normal;
4+
font-display: optional;
45
font-weight: 400;
5-
src: url(./MaterialIcons-Regular.eot); /* For IE6-8 */
6+
src: url(./fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
67
src: local('Material Icons'),
78
local('MaterialIcons-Regular'),
8-
url(./MaterialIcons-Regular.woff2) format('woff2'),
9-
url(./MaterialIcons-Regular.woff) format('woff'),
10-
url(./MaterialIcons-Regular.ttf) format('truetype');
9+
url(./fonts/MaterialIcons-Regular.woff2) format('woff2'),
10+
url(./fonts/MaterialIcons-Regular.woff) format('woff'),
11+
url(./fonts/MaterialIcons-Regular.ttf) format('truetype');
1112
}
12-
13+
1314
.material-icons {
1415
font-family: 'Material Icons';
1516
font-weight: normal;
@@ -22,16 +23,15 @@
2223
word-wrap: normal;
2324
white-space: nowrap;
2425
direction: ltr;
25-
26+
2627
/* Support for all WebKit browsers. */
2728
-webkit-font-smoothing: antialiased;
2829
/* Support for Safari and Chrome. */
2930
text-rendering: optimizeLegibility;
30-
31+
3132
/* Support for Firefox. */
3233
-moz-osx-font-smoothing: grayscale;
33-
34+
3435
/* Support for IE. */
3536
font-feature-settings: 'liga';
3637
}
37-

Diff for: lib/module.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,11 @@ module.exports = function nuxt7 (_options) {
4242

4343
// Icons
4444
if (options.f7Icons) {
45-
options.f7IconsSrc = 'framework7-icons/css/framework7-icons.css'
45+
options.f7IconsSrc = relative(this.options.buildDir, resolvePath('assets/icons/framework7-icons.css'))
4646
}
4747

4848
if (options.mdIcons) {
49-
const iconDir = resolvePath('assets/material-icons/material-icons.css')
50-
options.mdIconsSrc = relative(this.options.buildDir, iconDir)
49+
options.mdIconsSrc = relative(this.options.buildDir, resolvePath('assets/icons/material-icons.css'))
5150
}
5251

5352
// Enable nativeUI for a better Native experience

Diff for: package.json

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"dependencies": {
2525
"@nuxtjs/pwa": "^2.0.2",
2626
"framework7": "^2.0.0-beta.17",
27-
"framework7-icons": "^0.8.9",
2827
"framework7-vue": "^2.0.0-beta.5",
2928
"less": "^2.7.3",
3029
"less-loader": "^4.0.5",

0 commit comments

Comments
 (0)