Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 53a15c4

Browse files
committed
Merge pull request #2 from appirio-tech/font-awesome
Add support for fontawesome which adds its version to the end of the extensions
2 parents 387435c + 163d83d commit 53a15c4

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
"main": "./webpack.config.coffee",
55
"devDependencies": {
66
"angular": "^1.4.x",
7-
"zepto": "0.0.4",
7+
"font-awesome": "^4.5.0",
8+
"npm-prepublish": "^1.2.1",
89
"react": "0.14.x",
910
"react-dom": "0.14.x",
10-
"npm-prepublish": "^1.2.1"
11+
"zepto": "0.0.4"
1112
},
1213
"scripts": {
1314
"dev": "webpack-dev-server -d --colors",

src/scripts/elements/hello.react.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
h1= message
44

5-
button(onClick=onClick) click me
5+
button(onClick=onClick) #[i(className="fa fa-reddit-alien")] click me

src/src.coffee

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,11 @@ require 'angular'
33
require './scripts/home'
44
require './views/home'
55
require './styles/home'
6-
require './images/project-custom.svg'
6+
require './images/project-custom.svg'
7+
8+
require '../node_modules/font-awesome/fonts/fontawesome-webfont.eot'
9+
require '../node_modules/font-awesome/fonts/fontawesome-webfont.svg'
10+
require '../node_modules/font-awesome/fonts/fontawesome-webfont.ttf'
11+
require '../node_modules/font-awesome/fonts/fontawesome-webfont.woff'
12+
require '../node_modules/font-awesome/fonts/fontawesome-webfont.woff2'
13+
require '../node_modules/font-awesome/css/font-awesome.css'

webpack.config.coffee

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,13 @@ module.exports = (options) ->
173173
# Rename the file using the asset hash
174174
# Pass along the updated reference to your code
175175
# You can add here any file extension you want to get copied to your output
176-
test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|ttf|eot)$/
176+
test: /\.(png|jpg|jpeg|gif)$/
177+
loader: 'file'
178+
,
179+
test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/
180+
loader: 'file'
181+
,
182+
test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/
177183
loader: 'file'
178184
]
179185
postLoaders: [

0 commit comments

Comments
 (0)