Skip to content

Commit 86a8fa3

Browse files
committed
fix(stylus): use bootstrap-styl, font-awesome-stylus
1 parent 34dd31e commit 86a8fa3

File tree

2 files changed

+10
-29
lines changed

2 files changed

+10
-29
lines changed

Diff for: templates/app/_package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@
5757
},
5858
"devDependencies": {
5959
<%_ /* CLIENT */ _%>
60-
"angular-mocks": "~1.5.5",
60+
"angular-mocks": "~1.5.5",<% if(filters.stylus) { %>
61+
"bootstrap-styl": "^5.0.5",
62+
"font-awesome-stylus": "^4.6.2",<% } %>
6163
<%_ /* END CLIENT */ _%>
6264
"autoprefixer": "^6.0.0",
6365
"babel-core": "^6.6.5",

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

+7-28
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,11 @@
1-
@import "../../node_modules/font-awesome/css/font-awesome.css"
2-
<% if (filters.bootstrap) { %>@import "../../node_modules/bootstrap/dist/css/bootstrap.css"
3-
<% if (filters.oauth) { %>@import "../../node_modules/bootstrap-social/bootstrap-social.css"
4-
<% } %>
5-
//
6-
// Bootstrap Fonts
7-
//
8-
9-
@font-face
10-
font-family: 'Glyphicons Halflings'
11-
src: url('/assets/fonts/bootstrap/glyphicons-halflings-regular.eot')
12-
src: url('/assets/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
13-
url('/assets/fonts/bootstrap/glyphicons-halflings-regular.woff') format('woff'),
14-
url('/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf') format('truetype'),
15-
url('/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
16-
<% } %>
17-
//
18-
// Font Awesome Fonts
19-
//
1+
$fa-font-path = '../assets/fonts/font-awesome/'
2+
@import '~font-awesome-stylus/stylus/index'
203

21-
@font-face
22-
font-family: 'FontAwesome'
23-
src: url('/assets/fonts/font-awesome/fontawesome-webfont.eot?v=4.1.0')
24-
src: url('/assets/fonts/font-awesome/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'),
25-
url('/assets/fonts/font-awesome/fontawesome-webfont.woff?v=4.1.0') format('woff'),
26-
url('/assets/fonts/font-awesome/fontawesome-webfont.ttf?v=4.1.0') format('truetype'),
27-
url('/assets/fonts/font-awesome/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
28-
font-weight: normal
29-
font-style: normal
4+
<%_ if (filters.bootstrap) { %>
5+
$icon-font-path = '../assets/fonts/bootstrap/'
6+
@import '~bootstrap-styl/bootstrap/index';
7+
<% if (filters.oauth) { %>@import '~bootstrap-social/bootstrap-social.css'
8+
<% } %><% } %>
309

3110
//
3211
// App-wide Styles

0 commit comments

Comments
 (0)