Permalink
Browse files

Changed font dir to fonts to match standard in npm and bower packages

1 parent 7c194a1 commit a1ca0a997efb692a27fcfa85a7cc5277b24c0e57 @Dogfalo committed Feb 15, 2016
View
Oops, something went wrong.
View
Oops, something went wrong.
View
@@ -16,27 +16,21 @@
"main": [
"bin/materialize.css",
"bin/materialize.js",
- "font/material-design-icons/Material-Design-Icons.eot",
- "font/material-design-icons/Material-Design-Icons.svg",
- "font/material-design-icons/Material-Design-Icons.ttf",
- "font/material-design-icons/Material-Design-Icons.woff",
- "font/material-design-icons/Material-Design-Icons.woff2",
- "font/roboto/Roboto-Bold.ttf",
- "font/roboto/Roboto-Bold.woff",
- "font/roboto/Roboto-Bold.woff2",
- "font/roboto/Roboto-Light.ttf",
- "font/roboto/Roboto-Light.woff",
- "font/roboto/Roboto-Light.woff2",
- "font/roboto/Roboto-Medium.ttf",
- "font/roboto/Roboto-Medium.woff",
- "font/roboto/Roboto-Medium.woff2",
- "font/roboto/Roboto-Regular.ttf",
- "font/roboto/Roboto-Regular.woff",
- "font/roboto/Roboto-Regular.woff2",
- "font/roboto/Roboto-Thin.ttf",
- "font/roboto/Roboto-Thin.woff",
- "font/roboto/Roboto-Thin.woff2",
- "sass/*"
+ "fonts/roboto/Roboto-Bold.ttf",
+ "fonts/roboto/Roboto-Bold.woff",
+ "fonts/roboto/Roboto-Bold.woff2",
+ "fonts/roboto/Roboto-Light.ttf",
+ "fonts/roboto/Roboto-Light.woff",
+ "fonts/roboto/Roboto-Light.woff2",
+ "fonts/roboto/Roboto-Medium.ttf",
+ "fonts/roboto/Roboto-Medium.woff",
+ "fonts/roboto/Roboto-Medium.woff2",
+ "fonts/roboto/Roboto-Regular.ttf",
+ "fonts/roboto/Roboto-Regular.woff",
+ "fonts/roboto/Roboto-Regular.woff2",
+ "fonts/roboto/Roboto-Thin.ttf",
+ "fonts/roboto/Roboto-Thin.woff",
+ "fonts/roboto/Roboto-Thin.woff2",
],
"ignore": [
"jade/",
Oops, something went wrong.
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.
@@ -212,8 +212,7 @@ <h4 >Project Structure</h4>
|--css/
| |--materialize.css
|
- |--font/
- | |--material-design-icons/
+ |--fonts/
| |--roboto/
|
|--js/
@@ -308,8 +307,7 @@ <h2 class="header">Sass Setup</h2>
|--css/
| |--materialize.css &lt;-- compiled from scss/materialize.scss
|
- |--font/
- | |--material-design-icons/
+ |--fonts/
| |--roboto/
|
|--js/
@@ -107,8 +107,7 @@ <h4 >Project Structure</h4>
|--css/
| |--materialize.css
|
- |--font/
- | |--material-design-icons/
+ |--fonts/
| |--roboto/
|
|--js/
@@ -203,8 +202,7 @@ <h2 class="header">Sass Setup</h2>
|--css/
| |--materialize.css &lt;-- compiled from scss/materialize.scss
|
- |--font/
- | |--material-design-icons/
+ |--fonts/
| |--roboto/
|
|--js/
View
@@ -14,26 +14,21 @@ Package.onUse(function (api) {
api.imply('jquery', 'client');
var assets = [
- 'dist/font/material-design-icons/Material-Design-Icons.eot',
- 'dist/font/material-design-icons/Material-Design-Icons.svg',
- 'dist/font/material-design-icons/Material-Design-Icons.ttf',
- 'dist/font/material-design-icons/Material-Design-Icons.woff',
- 'dist/font/material-design-icons/Material-Design-Icons.woff2',
- 'dist/font/roboto/Roboto-Bold.ttf',
- 'dist/font/roboto/Roboto-Bold.woff',
- 'dist/font/roboto/Roboto-Bold.woff2',
- 'dist/font/roboto/Roboto-Light.ttf',
- 'dist/font/roboto/Roboto-Light.woff',
- 'dist/font/roboto/Roboto-Light.woff2',
- 'dist/font/roboto/Roboto-Medium.ttf',
- 'dist/font/roboto/Roboto-Medium.woff',
- 'dist/font/roboto/Roboto-Medium.woff2',
- 'dist/font/roboto/Roboto-Regular.ttf',
- 'dist/font/roboto/Roboto-Regular.woff',
- 'dist/font/roboto/Roboto-Regular.woff2',
- 'dist/font/roboto/Roboto-Thin.ttf',
- 'dist/font/roboto/Roboto-Thin.woff',
- 'dist/font/roboto/Roboto-Thin.woff2',
+ 'dist/fonts/roboto/Roboto-Bold.ttf',
+ 'dist/fonts/roboto/Roboto-Bold.woff',
+ 'dist/fonts/roboto/Roboto-Bold.woff2',
+ 'dist/fonts/roboto/Roboto-Light.ttf',
+ 'dist/fonts/roboto/Roboto-Light.woff',
+ 'dist/fonts/roboto/Roboto-Light.woff2',
+ 'dist/fonts/roboto/Roboto-Medium.ttf',
+ 'dist/fonts/roboto/Roboto-Medium.woff',
+ 'dist/fonts/roboto/Roboto-Medium.woff2',
+ 'dist/fonts/roboto/Roboto-Regular.ttf',
+ 'dist/fonts/roboto/Roboto-Regular.woff',
+ 'dist/fonts/roboto/Roboto-Regular.woff2',
+ 'dist/fonts/roboto/Roboto-Thin.ttf',
+ 'dist/fonts/roboto/Roboto-Thin.woff',
+ 'dist/fonts/roboto/Roboto-Thin.woff2',
];
addAssets(api, assets);
@@ -132,8 +132,7 @@ $dropdown-item-height: 50px !default;
/* 9. Fonts
========================================================================== */
-$roboto-font-path: "../font/roboto/" !default;
-$icons-font-path: "../font/material-design-icons/" !default;
+$roboto-font-path: "../fonts/roboto/" !default;
/* 10. Forms
View
@@ -298,4 +298,4 @@ <h5 class="white-text">Connect</h5>
Materialize.scrollFire(options);
</script>
</body>
-</html>
+</html>
View
@@ -404,7 +404,7 @@ <h2 class="header">Responsive Table</h2>
<li><a href="#tables">Borderless</a></li>
<li><a href="#bordered">Bordered</a></li>
<li><a href="#striped">Striped</a></li>
- <li><a href="#highlight">highlight</a></li>
+ <li><a href="#highlight">Highlight</a></li>
<li><a href="#centered">Centered</a></li>
<li><a href="#responsive">Responsive</a></li>
</ul>

0 comments on commit a1ca0a9

Please sign in to comment.