Skip to content

Commit 1917ba3

Browse files
committed
fix(app:styles): use correct path for font awesome and glyphicons
1 parent 0aca9b5 commit 1917ba3

File tree

2 files changed

+41
-3
lines changed

2 files changed

+41
-3
lines changed

Diff for: app/templates/client/app/app(css).css

+15
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,21 @@
1212
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
1313
}
1414

15+
/**
16+
*Font Awesome Fonts
17+
*/
18+
19+
@font-face {
20+
font-family: 'FontAwesome';
21+
src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?v=4.1.0');
22+
src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'),
23+
url('../bower_components/font-awesome/fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'),
24+
url('../bower_components/font-awesome/fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'),
25+
url('../bower_components/font-awesome/fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
26+
font-weight: normal;
27+
font-style: normal;
28+
}
29+
1530
<% } %>/**
1631
* App-wide Styles
1732
*/

Diff for: app/templates/client/app/app(stylus).styl

+26-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,32 @@
1-
$icon-font-path = "/bower_components/bootstrap/dist/fonts"
2-
$fa-font-path = "/bower_components/font-awesome/fonts"
3-
41
@import "bootstrap/dist/css/bootstrap.css"
52
@import "font-awesome/css/font-awesome.css"
63

4+
//
5+
// Bootstrap Fonts
6+
//
7+
8+
@font-face
9+
font-family: 'Glyphicons Halflings'
10+
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot')
11+
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
12+
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'),
13+
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
14+
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
15+
16+
//
17+
// Font Awesome Fonts
18+
//
19+
20+
@font-face
21+
font-family: 'FontAwesome'
22+
src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?v=4.1.0')
23+
src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'),
24+
url('../bower_components/font-awesome/fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'),
25+
url('../bower_components/font-awesome/fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'),
26+
url('../bower_components/font-awesome/fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
27+
font-weight: normal
28+
font-style: normal
29+
730
//
831
// App-wide Styles
932
//

0 commit comments

Comments
 (0)