From eb86c7b8836ab197d8d0eb2568f858cabdc0e033 Mon Sep 17 00:00:00 2001 From: Giampaolo Bellavite Date: Fri, 5 Dec 2014 11:40:31 +0100 Subject: [PATCH] Move font @import out of the project (fix #8) --- README.md | 11 ++++++++++- docs/main.scss | 1 + material-ui/variables/_custom-variables.scss | 1 - 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 02d11ab..e388f3b 100644 --- a/README.md +++ b/README.md @@ -35,10 +35,19 @@ To preserve my own sanity I stripped out the mixins used to add browser prefixes ## Differences from the original version -**The framework will not change the behaviour of your HTML tags** +### The framework will not change the behaviour of your some HTML tags The original version included a set of HTML tags: `h1`, `h2`... `h6`, `p` and `hr`. These definitions are moved in [_html.scss](material-ui/_html.scss), which is not not imported by default. You need to import that file manually if you still need them. +### Roboto font is not imported + +You need to import it by yourself using adding this line to your .scss: + +```scss +@import url("//fonts.googleapis.com/css?family=Roboto:300,400,500"); +``` + +or, even better, add the relative JavaScript to load it, as described in the [Roboto Font page](http://www.google.com/fonts#UsePlace:use/Collection:Roboto). ## Contribute diff --git a/docs/main.scss b/docs/main.scss index 03f57c9..2316b5e 100644 --- a/docs/main.scss +++ b/docs/main.scss @@ -1,4 +1,5 @@ /* material-ui */ +@import url("http://fonts.googleapis.com/css?family=Roboto:300,400,500"); @import "../material-ui/main"; @import "../material-ui/html"; diff --git a/material-ui/variables/_custom-variables.scss b/material-ui/variables/_custom-variables.scss index 4de4192..4c6027e 100644 --- a/material-ui/variables/_custom-variables.scss +++ b/material-ui/variables/_custom-variables.scss @@ -2,7 +2,6 @@ // This is place to put any variable overrides as well. //Typography -@import url("http://fonts.googleapis.com/css?family=Roboto:300,400,500"); $headingFontFamily: "Roboto", sans-serif !default; $contentFontFamily: "Roboto", sans-serif !default;