From 16e745460dd5ea0d9d780d4e6ea07398c71d10f2 Mon Sep 17 00:00:00 2001 From: Nicolas Garnier Date: Mon, 29 Jun 2015 14:51:39 +0200 Subject: [PATCH] Make sure we show developers to include the MD Font after the MDL libs --- docs/_assets/codepen.js | 10 +++++----- docs/_templates/layout.html | 9 ++++----- docs/_templates/started.html | 30 +++++++++++++++--------------- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/docs/_assets/codepen.js b/docs/_assets/codepen.js index 960b89f6..a9f2e670 100644 --- a/docs/_assets/codepen.js +++ b/docs/_assets/codepen.js @@ -29,15 +29,15 @@ CodeBlockCodePen.prototype.init = function() { // Also insert the MDL Library. var mdlLibs = [ + // TODO: Remove below before launch. For testing only. + '', + '', + '', '', '', '', '', - '', - // TODO: Remove below before launch. For testing only. - '', - '', - '' + '' ]; for (var i = 0, len = this.htmlCodeBlocks.length; i < len; i++) { diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index a7899cb7..552a90b8 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -33,16 +33,15 @@ --> - - - - + + + +
diff --git a/docs/_templates/started.html b/docs/_templates/started.html index b076d412..22150aa9 100644 --- a/docs/_templates/started.html +++ b/docs/_templates/started.html @@ -37,9 +37,9 @@
Just add the following <link> and <script> elements into your HTML pages: - 
<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
-<link rel="stylesheet" href="$$hosted_libs_prefix$$/$$version$$/material.indigo-pink.min.css">
-<script src="$$hosted_libs_prefix$$/$$version$$/material.min.js"></script>
+ 
<link rel="stylesheet" href="$$hosted_libs_prefix$$/$$version$$/material.indigo-pink.min.css">
+<script src="$$hosted_libs_prefix$$/$$version$$/material.min.js"></script>
+<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">

Choose color scheme

@@ -52,9 +52,9 @@

Refer to these files by adding a <link> and a <script> elements into your HTML pages and also include the Material Icon font: - 
<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
-<link rel="stylesheet" href="./material.min.css">
-<script src="./material.min.js"></script>
+ 
<link rel="stylesheet" href="./material.min.css">
+<script src="./material.min.js"></script>
+<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
@@ -76,9 +76,9 @@ gulp

Refer to these files by adding a <link> and a <script> element into your HTML pages and also include the Material Icon font: - 
<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
-<link rel="stylesheet" href="./material.min.css">
-<script src="./material.min.js"></script>
+ 
<link rel="stylesheet" href="./material.min.css">
+<script src="./material.min.js"></script>
+<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">

@@ -100,9 +100,9 @@ gulp

Refer to these files by adding a <link> and a <script> element into your HTML pages and also include the Material Icon font: - 
<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
-<link rel="stylesheet" href="/node_modules/material-design-lite/material.min.css">
-<script src="/node_modules/material-design-lite/material.min.js"></script>
+ 
<link rel="stylesheet" href="/node_modules/material-design-lite/material.min.css">
+<script src="/node_modules/material-design-lite/material.min.js"></script>
+<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">

@@ -124,9 +124,9 @@ gulp

Refer to these files by adding a <link> and a <script> element into your HTML pages and also include the Material Icon font: - 
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
-<link rel="stylesheet" href="/node_modules/material-design-lite/material.min.css">
-<script src="/node_modules/material-design-lite/material.min.js"></script>
+ 
<link rel="stylesheet" href="/node_modules/material-design-lite/material.min.css">
+<script src="/node_modules/material-design-lite/material.min.js"></script>
+<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">