Skip to content

Commit 0dcf0a1

Browse files
authored
Merge pull request #1216 from shubhendusaurabh/issue-1165
fixes #1165 changed fonts path from absolute to relative
2 parents 3349f39 + 83849e2 commit 0dcf0a1

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

src/styles/_fonts.scss

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
// FONT STACK
22
// --------------------------------------------------------------------------------------------
33
// Use the mixin to include fonts.
4-
54
@mixin font-family($font-name, $font-weight, $font-style, $font-url, $font-file) {
65
@font-face {
7-
font-family: '#{$font-name}';
8-
src: url('#{$font-url}#{$font-file}.eot');
9-
src: url('#{$font-url}#{$font-file}.eot?#iefix') format('embedded-opentype'),
10-
url('#{$font-url}#{$font-file}.woff') format('woff'),
11-
url('#{$font-url}#{$font-file}.ttf') format('truetype'),
12-
url('#{$font-url}.svg##{$font-file}') format('svg');
13-
font-weight: $font-weight;
14-
font-style: $font-style;
6+
font-family: '#{$font-name}';
7+
src: url('#{$font-url}#{$font-file}.eot');
8+
src: url('#{$font-url}#{$font-file}.eot?#iefix') format('embedded-opentype'),
9+
url('#{$font-url}#{$font-file}.woff') format('woff'),
10+
url('#{$font-url}#{$font-file}.ttf') format('truetype'),
11+
url('#{$font-url}#{$font-file}.svg##{$font-name}') format('svg');
12+
font-weight: $font-weight;
13+
font-style: $font-style;
1514
}
1615
}
1716

@@ -30,20 +29,20 @@
3029
// 900 Black (Heavy)
3130

3231
// Roboto
33-
@include font-family('Roboto', 900, normal, '~/src/assets/fonts/roboto/', 'roboto-black');
34-
@include font-family('Roboto', 900, italic, '~/src/assets/fonts/roboto/', 'roboto-blackitalic');
32+
@include font-family('Roboto', 900, normal, '../assets/fonts/roboto/', 'roboto-black');
33+
@include font-family('Roboto', 900, italic, '../assets/fonts/roboto/', 'roboto-blackitalic');
3534

36-
@include font-family('Roboto', 700, normal, '~/src/assets/fonts/roboto/', 'roboto-bold');
37-
@include font-family('Roboto', 700, italic, '~/src/assets/fonts/roboto/', 'roboto-bolditalic');
35+
@include font-family('Roboto', 700, normal, '../assets/fonts/roboto/', 'roboto-bold');
36+
@include font-family('Roboto', 700, italic, '../assets/fonts/roboto/', 'roboto-bolditalic');
3837

39-
@include font-family('Roboto', 500, normal, '~/src/assets/fonts/roboto/', 'roboto-medium');
40-
@include font-family('Roboto', 500, italic, '~/src/assets/fonts/roboto/', 'roboto-mediumitalic');
38+
@include font-family('Roboto', 500, normal, '../assets/fonts/roboto/', 'roboto-medium');
39+
@include font-family('Roboto', 500, italic, '../assets/fonts/roboto/', 'roboto-mediumitalic');
4140

42-
@include font-family('Roboto', 400, normal, '~/src/assets/fonts/roboto/', 'roboto-regular');
43-
@include font-family('Roboto', 400, italic, '~/src/assets/fonts/roboto/', 'roboto-italic');
41+
@include font-family('Roboto', 400, normal, '../assets/fonts/roboto/', 'roboto-regular');
42+
@include font-family('Roboto', 400, italic, '../assets/fonts/roboto/', 'roboto-italic');
4443

45-
@include font-family('Roboto', 300, normal, '~/src/assets/fonts/roboto/', 'roboto-light');
46-
@include font-family('Roboto', 300, italic, '~/src/assets/fonts/roboto/', 'roboto-lightitalic');
44+
@include font-family('Roboto', 300, normal, '../assets/fonts/roboto/', 'roboto-light');
45+
@include font-family('Roboto', 300, italic, '../assets/fonts/roboto/', 'roboto-lightitalic');
4746

48-
@include font-family('Roboto', 100, normal, '~/src/assets/fonts/roboto/', 'roboto-thin');
49-
@include font-family('Roboto', 100, italic, '~/src/assets/fonts/roboto/', 'roboto-thinitalic');
47+
@include font-family('Roboto', 100, normal, '../assets/fonts/roboto/', 'roboto-thin');
48+
@include font-family('Roboto', 100, italic, '../assets/fonts/roboto/', 'roboto-thinitalic');

0 commit comments

Comments
 (0)