google
/
material-design-lite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve further conflicts (Closes #533)

master
Addy Osmani 2015-06-29 15:18:44 +01:00
parent e52b664f2d
commit e87705417a
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docs/_templates/layout.html vendored
View File

@ -37,7 +37,6 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/0.0.1/prism.min.css">
<link rel="stylesheet" href="{{page.include_prefix}}material.min.css">
<link rel="stylesheet" href="{{page.include_prefix}}assets/main.css">
<script src="{{page.include_prefix}}material.min.js"></script>
<!-- Fonts -->
<link href='https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en' rel='stylesheet' type='text/css'>
@ -108,6 +107,20 @@
This is a <em>preview</em> of Material Design Lite. It is still very much work-in-progress. We are launching soon!
</div>
<!-- IE Compatibility shims -->
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js""></script>
<![endif]-->
<!--[if IE]>
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.7/es5-shim.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/classlist/2014.01.31/classList.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/selectivizr/1.0.2/selectivizr-min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/flexie/1.0.3/flexie.min.js"></script>
<link href="{{page.include_prefix}}assets/ie.css" rel="stylesheet">
<![endif]-->
<!-- end shims -->
<!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@ -117,6 +130,8 @@
ga('create', 'UA-XXXXX-X', 'auto');
ga('send', 'pageview');
</script>
<!-- Material Design Lite -->
<script src="{{page.include_prefix}}material.js"></script>
<!-- Add Copy-to-CodePen buttons to code blocks -->
<script src="{{page.include_prefix}}assets/codepen.js"></script>
<!-- Enable Prism syntax highlighting -->