readme and includes updates

This commit is contained in:
Kevin Ross 2015-11-24 16:49:15 -06:00
parent 466416497b
commit 5177178d7c
3 changed files with 21 additions and 13 deletions

View File

@ -30,17 +30,20 @@ If you prefer, you can include this framework in your project using our official
## Getting started
### Add fonts
Add the necessary links to your `<head` element for fonts
To embed Roboto into your web page, copy the code as the first element in the <head> of your HTML document.
```
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
```
```html
<!-- Material Design fonts -->
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
TODO: link for font
TODO: link for icon font
TODO: link for bmd
<!-- Bootstrap -->
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap Material Design -->
<link href="dist/css/bootstrap-material-design.css" rel="stylesheet">
<link href="dist/css/ripples.min.css" rel="stylesheet">
```
## Support

View File

@ -8,13 +8,18 @@
<title>Bootstrap Material</title>
<!-- Bootstrap Material Design fonts -->
<!-- Material Design fonts -->
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!-- Bootstrap -->
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap Material Design -->
<link href="dist/css/bootstrap-material-design.css" rel="stylesheet">
<link href="dist/css/ripples.min.css" rel="stylesheet">
<link href="//fezvrasta.github.io/snackbarjs/dist/snackbar.min.css" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1">
<style>

View File

@ -9,14 +9,14 @@
<!-- Mobile support -->
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Bootstrap Material Design fonts -->
<!-- Material Design fonts -->
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!-- Twitter Bootstrap -->
<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap -->
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
<!-- Material Design for Bootstrap -->
<!-- Bootstrap Material Design -->
<link href="dist/css/bootstrap-material-design.css" rel="stylesheet">
<link href="dist/css/ripples.min.css" rel="stylesheet">