Permalink
Browse files

feature: Material-Icon-Font and Roboto is include in package

  • Loading branch information...
MikeMitterer committed Jun 18, 2015
1 parent 902d9fb commit ea9cb640d2c99e6669f0c1672d4ec76dc8a46599
@@ -3,13 +3,13 @@
font-style: normal;
font-weight: 400;
src: url($icon-font-path + '/material/' + 'MaterialIcons-Regular.eot'); /* For IE6-8 */
src: url(package-root("assets/fonts/material/") + 'MaterialIcons-Regular.eot'); /* For IE6-8 */
src: local('Material Icons'),
local('MaterialIcons-Regular'),
url($icon-font-path + '/material/' + 'MaterialIcons-Regular.woff2') format('woff2'),
url($icon-font-path + '/material/' + 'MaterialIcons-Regular.woff') format('woff'),
url($icon-font-path + '/material/' + 'MaterialIcons-Regular.ttf') format('truetype');
url(package-root("assets/fonts/material/") + 'MaterialIcons-Regular.woff2') format('woff2'),
url(package-root("assets/fonts/material/") + 'MaterialIcons-Regular.woff') format('woff'),
url(package-root("assets/fonts/material/") + 'MaterialIcons-Regular.ttf') format('truetype');
}
@@ -6,9 +6,9 @@
src: local('Roboto-Regular'),
local('Roboto-Regular'),
url($icon-font-path + '/roboto/' + 'Roboto-Regular.woff2') format('woff2'),
url($icon-font-path + '/roboto/' + 'Roboto-Regular.woff') format('woff'),
url($icon-font-path + '/roboto/' + 'Roboto-Regular.ttf') format('truetype');
url(package-root("assets/fonts/roboto/") + 'Roboto-Regular.woff2') format('woff2'),
url(package-root("assets/fonts/roboto/") + 'Roboto-Regular.woff') format('woff'),
url(package-root("assets/fonts/roboto/") + 'Roboto-Regular.ttf') format('truetype');
}
@font-face {
@@ -19,9 +19,9 @@
src: local('Roboto-Thin'),
local('Roboto-Thin'),
url($icon-font-path + '/roboto/' + 'Roboto-Thin.woff2') format('woff2'),
url($icon-font-path + '/roboto/' + 'Roboto-Thin.woff') format('woff'),
url($icon-font-path + '/roboto/' + 'Roboto-Thin.ttf') format('truetype');
url(package-root("assets/fonts/roboto/") + 'Roboto-Thin.woff2') format('woff2'),
url(package-root("assets/fonts/roboto/") + 'Roboto-Thin.woff') format('woff'),
url(package-root("assets/fonts/roboto/") + 'Roboto-Thin.ttf') format('truetype');
}
@font-face {
@@ -32,9 +32,9 @@
src: local('Roboto-Light'),
local('Roboto-Light'),
url($icon-font-path + '/roboto/' + 'Roboto-Light.woff2') format('woff2'),
url($icon-font-path + '/roboto/' + 'Roboto-Light.woff') format('woff'),
url($icon-font-path + '/roboto/' + 'Roboto-Light.ttf') format('truetype');
url(package-root("assets/fonts/roboto/") + 'Roboto-Light.woff2') format('woff2'),
url(package-root("assets/fonts/roboto/") + 'Roboto-Light.woff') format('woff'),
url(package-root("assets/fonts/roboto/") + 'Roboto-Light.ttf') format('truetype');
}
@font-face {
@@ -45,9 +45,9 @@
src: local('Roboto-Medium'),
local('Roboto-Medium'),
url($icon-font-path + '/roboto/' + 'Roboto-Medium.woff2') format('woff2'),
url($icon-font-path + '/roboto/' + 'Roboto-Medium.woff') format('woff'),
url($icon-font-path + '/roboto/' + 'Roboto-Medium.ttf') format('truetype');
url(package-root("assets/fonts/roboto/") + 'Roboto-Medium.woff2') format('woff2'),
url(package-root("assets/fonts/roboto/") + 'Roboto-Medium.woff') format('woff'),
url(package-root("assets/fonts/roboto/") + 'Roboto-Medium.ttf') format('truetype');
}
@font-face {
@@ -58,7 +58,7 @@
src: local('Roboto-Bold'),
local('Roboto-Bold'),
url($icon-font-path + '/roboto/' + 'Roboto-Bold.woff2') format('woff2'),
url($icon-font-path + '/roboto/' + 'Roboto-Bold.woff') format('woff'),
url($icon-font-path + '/roboto/' + 'Roboto-Bold.ttf') format('truetype');
url(package-root("assets/fonts/roboto/") + 'Roboto-Bold.woff2') format('woff2'),
url(package-root("assets/fonts/roboto/") + 'Roboto-Bold.woff') format('woff'),
url(package-root("assets/fonts/roboto/") + 'Roboto-Bold.ttf') format('truetype');
}
@@ -1,4 +1,5 @@
// Typography
@import "fonts/fonts";
@import "typography/typography";
// Components
@@ -17,6 +17,10 @@ $_show_config_info_for_mdl: 1 !default;
package-root: (package-root()) #{package-root()}
package-assets: (package-assets("upload/sample.svg")) #{package-assets("upload/sample.svg")}
Fonts:
----------
Location: (package-root("assets/fonts")) #{package-root("assets/fonts")}
Colors:
----------
Theme: ($theme-name) #{$theme-name}
@@ -1,4 +1,2 @@
$icon-font-path : "./packages/mdl/assets/fonts" !default;
@import "../../fonts/material/material";
@import "../../fonts/roboto/roboto";
@@ -12,6 +12,10 @@
package-root: (package-root()) ../../../../packages/mdl
package-assets: (package-assets("upload/sample.svg")) ../../../../packages/mdl/assets/styles/upload/sample.svg
Fonts:
----------
Location: (package-root("assets/fonts")) ../../../../packages/mdl/assets/fonts
Colors:
----------
Theme: ($theme-name) blue_grey-pink
@@ -2110,6 +2114,92 @@ a, .mdl-accordion, .mdl-button, .mdl-card, .mdl-checkbox, .mdl-dropdown-menu, .m
.mdl-color-text--accent-A700 {
color: #c51162 !important; }
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url("../../../../packages/mdl/assets/fonts/material/MaterialIcons-Regular.eot");
/* For IE6-8 */
src: local('Material Icons'), local('MaterialIcons-Regular'), url("../../../../packages/mdl/assets/fonts/material/MaterialIcons-Regular.woff2") format('woff2'), url("../../../../packages/mdl/assets/fonts/material/MaterialIcons-Regular.woff") format('woff'), url("../../../../packages/mdl/assets/fonts/material/MaterialIcons-Regular.ttf") format('truetype'); }
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 24px;
/* Preferred icon size */
display: inline-block;
width: 1em;
height: 1em;
line-height: 1;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
/* Support for Safari and Chrome. */
text-rendering: optimizeLegibility;
/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;
/* Support for IE. */
-webkit-font-feature-settings: 'liga';
-moz-font-feature-settings: 'liga';
font-feature-settings: 'liga'; }
.material-icons.md-18 {
font-size: 18px; }
.material-icons.md-24 {
font-size: 24px; }
.material-icons.md-36 {
font-size: 36px; }
.material-icons.md-48 {
font-size: 48px; }
.material-icons.md-dark {
color: rgba(0, 0, 0, 0.54); }
.material-icons.md-dark.md-inactive {
color: rgba(0, 0, 0, 0.26); }
.material-icons.md-light {
color: white; }
.material-icons.md-light.md-inactive {
color: rgba(255, 255, 255, 0.3); }
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local('Roboto-Regular'), local('Roboto-Regular'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Regular.woff2") format('woff2'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Regular.woff") format('woff'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Regular.ttf") format('truetype'); }
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 200;
src: local('Roboto-Thin'), local('Roboto-Thin'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Thin.woff2") format('woff2'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Thin.woff") format('woff'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Thin.ttf") format('truetype'); }
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: local('Roboto-Light'), local('Roboto-Light'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Light.woff2") format('woff2'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Light.woff") format('woff'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Light.ttf") format('truetype'); }
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 500;
src: local('Roboto-Medium'), local('Roboto-Medium'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Medium.woff2") format('woff2'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Medium.woff") format('woff'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Medium.ttf") format('truetype'); }
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: local('Roboto-Bold'), local('Roboto-Bold'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Bold.woff2") format('woff2'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Bold.woff") format('woff'), url("../../../../packages/mdl/assets/fonts/roboto/Roboto-Bold.ttf") format('truetype'); }
/**
* Copyright 2015 Google Inc. All Rights Reserved.
*

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit ea9cb64

Please sign in to comment.