Skip to content

Commit a1ca0a9

Browse files
committed
Changed font dir to fonts to match standard in npm and bower packages
1 parent 7c194a1 commit a1ca0a9

30 files changed

+215
-3512
lines changed

Gruntfile.js

+165-165
Large diffs are not rendered by default.

bin/materialize.css

+11-3,292
Large diffs are not rendered by default.

bower.json

+15-21
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,21 @@
1616
"main": [
1717
"bin/materialize.css",
1818
"bin/materialize.js",
19-
"font/material-design-icons/Material-Design-Icons.eot",
20-
"font/material-design-icons/Material-Design-Icons.svg",
21-
"font/material-design-icons/Material-Design-Icons.ttf",
22-
"font/material-design-icons/Material-Design-Icons.woff",
23-
"font/material-design-icons/Material-Design-Icons.woff2",
24-
"font/roboto/Roboto-Bold.ttf",
25-
"font/roboto/Roboto-Bold.woff",
26-
"font/roboto/Roboto-Bold.woff2",
27-
"font/roboto/Roboto-Light.ttf",
28-
"font/roboto/Roboto-Light.woff",
29-
"font/roboto/Roboto-Light.woff2",
30-
"font/roboto/Roboto-Medium.ttf",
31-
"font/roboto/Roboto-Medium.woff",
32-
"font/roboto/Roboto-Medium.woff2",
33-
"font/roboto/Roboto-Regular.ttf",
34-
"font/roboto/Roboto-Regular.woff",
35-
"font/roboto/Roboto-Regular.woff2",
36-
"font/roboto/Roboto-Thin.ttf",
37-
"font/roboto/Roboto-Thin.woff",
38-
"font/roboto/Roboto-Thin.woff2",
39-
"sass/*"
19+
"fonts/roboto/Roboto-Bold.ttf",
20+
"fonts/roboto/Roboto-Bold.woff",
21+
"fonts/roboto/Roboto-Bold.woff2",
22+
"fonts/roboto/Roboto-Light.ttf",
23+
"fonts/roboto/Roboto-Light.woff",
24+
"fonts/roboto/Roboto-Light.woff2",
25+
"fonts/roboto/Roboto-Medium.ttf",
26+
"fonts/roboto/Roboto-Medium.woff",
27+
"fonts/roboto/Roboto-Medium.woff2",
28+
"fonts/roboto/Roboto-Regular.ttf",
29+
"fonts/roboto/Roboto-Regular.woff",
30+
"fonts/roboto/Roboto-Regular.woff2",
31+
"fonts/roboto/Roboto-Thin.ttf",
32+
"fonts/roboto/Roboto-Thin.woff",
33+
"fonts/roboto/Roboto-Thin.woff2",
4034
],
4135
"ignore": [
4236
"jade/",

css/ghpages-materialize.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

getting-started.html

+2-4
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,7 @@ <h4 >Project Structure</h4>
212212
|--css/
213213
| |--materialize.css
214214
|
215-
|--font/
216-
| |--material-design-icons/
215+
|--fonts/
217216
| |--roboto/
218217
|
219218
|--js/
@@ -308,8 +307,7 @@ <h4>Compiling Sass</h4>
308307
|--css/
309308
| |--materialize.css &lt;-- compiled from scss/materialize.scss
310309
|
311-
|--font/
312-
| |--material-design-icons/
310+
|--fonts/
313311
| |--roboto/
314312
|
315313
|--js/

jade/getting_started/getting_started_content.html

+2-4
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ <h4 >Project Structure</h4>
107107
|--css/
108108
| |--materialize.css
109109
|
110-
|--font/
111-
| |--material-design-icons/
110+
|--fonts/
112111
| |--roboto/
113112
|
114113
|--js/
@@ -203,8 +202,7 @@ <h4>Compiling Sass</h4>
203202
|--css/
204203
| |--materialize.css &lt;-- compiled from scss/materialize.scss
205204
|
206-
|--font/
207-
| |--material-design-icons/
205+
|--fonts/
208206
| |--roboto/
209207
|
210208
|--js/

package.js

+15-20
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,21 @@ Package.onUse(function (api) {
1414
api.imply('jquery', 'client');
1515

1616
var assets = [
17-
'dist/font/material-design-icons/Material-Design-Icons.eot',
18-
'dist/font/material-design-icons/Material-Design-Icons.svg',
19-
'dist/font/material-design-icons/Material-Design-Icons.ttf',
20-
'dist/font/material-design-icons/Material-Design-Icons.woff',
21-
'dist/font/material-design-icons/Material-Design-Icons.woff2',
22-
'dist/font/roboto/Roboto-Bold.ttf',
23-
'dist/font/roboto/Roboto-Bold.woff',
24-
'dist/font/roboto/Roboto-Bold.woff2',
25-
'dist/font/roboto/Roboto-Light.ttf',
26-
'dist/font/roboto/Roboto-Light.woff',
27-
'dist/font/roboto/Roboto-Light.woff2',
28-
'dist/font/roboto/Roboto-Medium.ttf',
29-
'dist/font/roboto/Roboto-Medium.woff',
30-
'dist/font/roboto/Roboto-Medium.woff2',
31-
'dist/font/roboto/Roboto-Regular.ttf',
32-
'dist/font/roboto/Roboto-Regular.woff',
33-
'dist/font/roboto/Roboto-Regular.woff2',
34-
'dist/font/roboto/Roboto-Thin.ttf',
35-
'dist/font/roboto/Roboto-Thin.woff',
36-
'dist/font/roboto/Roboto-Thin.woff2',
17+
'dist/fonts/roboto/Roboto-Bold.ttf',
18+
'dist/fonts/roboto/Roboto-Bold.woff',
19+
'dist/fonts/roboto/Roboto-Bold.woff2',
20+
'dist/fonts/roboto/Roboto-Light.ttf',
21+
'dist/fonts/roboto/Roboto-Light.woff',
22+
'dist/fonts/roboto/Roboto-Light.woff2',
23+
'dist/fonts/roboto/Roboto-Medium.ttf',
24+
'dist/fonts/roboto/Roboto-Medium.woff',
25+
'dist/fonts/roboto/Roboto-Medium.woff2',
26+
'dist/fonts/roboto/Roboto-Regular.ttf',
27+
'dist/fonts/roboto/Roboto-Regular.woff',
28+
'dist/fonts/roboto/Roboto-Regular.woff2',
29+
'dist/fonts/roboto/Roboto-Thin.ttf',
30+
'dist/fonts/roboto/Roboto-Thin.woff',
31+
'dist/fonts/roboto/Roboto-Thin.woff2',
3732
];
3833

3934
addAssets(api, assets);

sass/components/_variables.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ $dropdown-item-height: 50px !default;
132132
/* 9. Fonts
133133
========================================================================== */
134134

135-
$roboto-font-path: "../font/roboto/" !default;
136-
$icons-font-path: "../font/material-design-icons/" !default;
135+
$roboto-font-path: "../fonts/roboto/" !default;
137136

138137

139138
/* 10. Forms

scrollfire.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,4 +298,4 @@ <h5 class="white-text">Connect</h5>
298298
Materialize.scrollFire(options);
299299
</script>
300300
</body>
301-
</html>
301+
</html>

table.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ <h2 class="header">Responsive Table</h2>
404404
<li><a href="#tables">Borderless</a></li>
405405
<li><a href="#bordered">Bordered</a></li>
406406
<li><a href="#striped">Striped</a></li>
407-
<li><a href="#highlight">highlight</a></li>
407+
<li><a href="#highlight">Highlight</a></li>
408408
<li><a href="#centered">Centered</a></li>
409409
<li><a href="#responsive">Responsive</a></li>
410410
</ul>

0 commit comments

Comments
 (0)