From a380e30f7e6a49a1438eca82d29d92c76168d9dd Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <Kev.Kirsche+GitHub@gmail.com>
Date: Fri, 23 Jan 2015 14:34:52 -0500
Subject: =?UTF-8?q?Fix=20issue=20#15601=20=E2=80=94=20Position=20of=20X-UA?=
 =?UTF-8?q?-Compatible?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue #15601 — Position of X-UA-Compatible, charset and viewport

Add comment to all examples

The non-responsive is correctly saying 2 instead of 3
---
 docs/examples/dashboard/index.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/examples/dashboard')

diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index c3445c390..463dbdcb9 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="../../favicon.ico">
-- 
cgit v1.2.3


From a2c7233ac05f3fec7caef614ec4dd35807414da9 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Sat, 7 Feb 2015 17:59:19 -0800
Subject: Use just holder.js instead of docs.min.js in examples when possible

And add explanatory comments to the Carousel & Dashboard examples regarding holder.js

[skip sauce]
---
 docs/examples/dashboard/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/examples/dashboard')

diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index 463dbdcb9..3e5421c98 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -240,7 +240,8 @@
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
-    <script src="../../assets/js/docs.min.js"></script>
+    <!-- Just to make our placeholder images work. Don't actually copy the next line! -->
+    <script src="../../assets/js/vendor/holder.js"></script>
     <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
     <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
-- 
cgit v1.2.3