Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

Commit

Permalink
Move font @import out of the project (fix #8)
Browse files Browse the repository at this point in the history
  • Loading branch information
gpbl committed Dec 5, 2014
1 parent 504f96a commit eb86c7b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions docs/main.scss
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
1 change: 0 additions & 1 deletion material-ui/variables/_custom-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit eb86c7b

Please sign in to comment.