Skip to content

Commit e22214a

Browse files
committed
Merge pull request #2 from colinsullivan/fontawesome-update-fixes
Change font type from woff to woff2, class changes from spinning to animated.
2 parents 2c602f7 + d25c288 commit e22214a

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = {
1616
loaders: [
1717
// the url-loader uses DataUrls.
1818
// the file-loader emits files.
19-
{ test: /\.woff(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "url-loader?limit=10000&minetype=application/font-woff" },
19+
{ test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "url-loader?limit=10000&minetype=application/font-woff" },
2020
{ test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file-loader" }
2121
]
2222
}
@@ -107,4 +107,4 @@ module.exports = {
107107
};
108108
```
109109

110-
Install `extract-text-webpack-plugin` before using this configuration.
110+
Install `extract-text-webpack-plugin` before using this configuration.

font-awesome-styles.loader.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ var styles = [
33

44
'bordered-pulled',
55
'core',
6-
'extras',
76
'fixed-width',
87
'icons',
98
'larger',
109
'list',
1110
'path',
1211
'rotated-flipped',
13-
'spinning',
12+
'animated',
1413
'stacked'
1514
];
1615

@@ -27,4 +26,4 @@ module.exports = function(content) {
2726
return "@import \"~font-awesome/less/" + style + ".less\";";
2827
}).join("\n");
2928
return source;
30-
};
29+
};

font-awesome.config.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ module.exports = {
33
'mixins': true,
44
'bordered-pulled': true,
55
'core': true,
6-
'extras': true,
76
'fixed-width': true,
87
'icons': true,
98
'larger': true,
109
'list': true,
1110
'path': true,
1211
'rotated-flipped': true,
13-
'spinning': true,
12+
'animated': true,
1413
'stacked': true
1514
}
16-
};
15+
};

0 commit comments

Comments
 (0)