Skip to content

Commit 9d95083

Browse files
Awk34Awk34
committed
fix(client): fix css/font paths
1 parent 2274545 commit 9d95083

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

‎templates/app/client/app/app(css).css‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
@font-face {
77
font-family: 'Glyphicons Halflings';
8-
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot');
9-
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
10-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'),
11-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
12-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
8+
src: url('/assets/fonts/bootstrap/glyphicons-halflings-regular.eot');
9+
src: url('/assets/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
10+
url('/assets/fonts/bootstrap/glyphicons-halflings-regular.woff') format('woff'),
11+
url('/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf') format('truetype'),
12+
url('/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
1313
}<% } %>
1414

1515
/**
@@ -18,11 +18,11 @@
1818

1919
@font-face {
2020
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');
21+
src: url('/assets/fonts/font-awesome/fontawesome-webfont.eot?v=4.1.0');
22+
src: url('/assets/fonts/font-awesome/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'),
23+
url('/assets/fonts/font-awesome/fontawesome-webfont.woff?v=4.1.0') format('woff'),
24+
url('/assets/fonts/font-awesome/fontawesome-webfont.ttf?v=4.1.0') format('truetype'),
25+
url('/assets/fonts/font-awesome/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
2626
font-weight: normal;
2727
font-style: normal;
2828
}

‎templates/app/client/app/app(less).less‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<% if (filters.bootstrap) { %>@import '../bower_components/bootstrap/less/bootstrap.less';
2-
<% if(filters.oauth) { %>@import '../bower_components/bootstrap-social/bootstrap-social.less';
3-
<% }} %>@import '../bower_components/font-awesome/less/font-awesome.less';
1+
<% if(filters.bootstrap) { %>@import '../../node_modules/bootstrap/less/bootstrap.less';
2+
<% if(filters.oauth) { %>@import '../../node_modules/bootstrap-social/bootstrap-social.less';
3+
<% }} %>@import '../../node_modules/font-awesome/less/font-awesome.less';
44

5-
<% if (filters.bootstrap) { %>@icon-font-path: '../bower_components/bootstrap/fonts/';<% } %>
6-
@fa-font-path: '../bower_components/font-awesome/fonts';
5+
<% if(filters.bootstrap) { %>@icon-font-path: '/assets/fonts/bootstrap/';<% } %>
6+
@fa-font-path: '/assets/fonts/font-awesome/';
77

88
/**
99
* App-wide Styles

‎templates/app/client/app/app(sass).scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<%_ if (filters.bootstrap) { _%>
2-
$icon-font-path: "/assets/fonts/bootstrap/";
2+
$icon-font-path: '/assets/fonts/bootstrap/';
33
@import '../../node_modules/bootstrap-sass/vendor/assets/stylesheets/bootstrap';
44
<%_ if(filters.oauth) { _%>
55
@import '../../node_modules/bootstrap-social/bootstrap-social.scss';
66
<% }} _%>
7-
$fa-font-path: "/assets/fonts/font-awesome/";
7+
$fa-font-path: '/assets/fonts/font-awesome/';
88
@import '../../node_modules/font-awesome/scss/font-awesome';
99

1010
// @import url(http://fonts.googleapis.com/css?family=Open+Sans:300,400,600,900|Roboto:300,500,700,900);

‎templates/app/client/app/app(stylus).styl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
@import "../bower_components/font-awesome/css/font-awesome.css"
2-
<% if (filters.bootstrap) { %>@import "../bower_components/bootstrap/dist/css/bootstrap.css"
3-
<% if (filters.oauth) { %>@import "../bower_components/bootstrap-social/bootstrap-social.css"
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"
44
<% } %>
55
//
66
// Bootstrap Fonts
77
//
88

99
@font-face
1010
font-family: 'Glyphicons Halflings'
11-
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot')
12-
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
13-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'),
14-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
15-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
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');
1616
<% } %>
1717
//
1818
// Font Awesome Fonts
1919
//
2020

2121
@font-face
2222
font-family: 'FontAwesome'
23-
src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?v=4.1.0')
24-
src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'),
25-
url('../bower_components/font-awesome/fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'),
26-
url('../bower_components/font-awesome/fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'),
27-
url('../bower_components/font-awesome/fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
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');
2828
font-weight: normal
2929
font-style: normal
3030

0 commit comments

Comments
 (0)