From 4f9270cc20c29cd3fbb0664379d620d14bb24a91 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Mon, 24 Mar 2014 09:28:40 +0200
Subject: Switch to `icon` instead of `shortcut icon` to fix the HTML
 validation tests.

---
 docs/examples/grid/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/examples/grid')

diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 54bdfbe0a..6bd945de2 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Grid Template for Bootstrap</title>
 
-- 
cgit v1.2.3


From c8a8e768510cc1bd9e72d5cade23fba715efb59f Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 17 Apr 2014 01:08:54 -0700
Subject: fixes #13365: remove dupe css in grid example

---
 docs/examples/grid/grid.css | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'docs/examples/grid')

diff --git a/docs/examples/grid/grid.css b/docs/examples/grid/grid.css
index a7a106d06..b25263bc7 100644
--- a/docs/examples/grid/grid.css
+++ b/docs/examples/grid/grid.css
@@ -1,8 +1,3 @@
-.container {
-  padding-right: 15px;
-  padding-left: 15px;
-}
-
 h4 {
   margin-top: 25px;
 }
-- 
cgit v1.2.3


From 448086f95a9114fb9ad96b76c5fc7b12a6fc51fd Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Sun, 20 Apr 2014 16:09:47 -0700
Subject: add IE10 viewport bug workaround to examples

Closes #13379.
---
 docs/examples/grid/index.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs/examples/grid')

diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 6bd945de2..592fa1d29 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -19,6 +19,9 @@
     <!-- Just for debugging purposes. Don't actually copy this line! -->
     <!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
 
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-- 
cgit v1.2.3


From a549e8c332c44ed3b79e3250a0a0d87cc06f7e00 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Mon, 21 Apr 2014 19:11:23 +0300
Subject: Update html5shiv to v3.7.1.

---
 docs/examples/grid/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/examples/grid')

diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 6bd945de2..afd386d21 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -21,7 +21,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
   </head>
-- 
cgit v1.2.3


From 52b6a3214574de58bee6e08049e5b477bb4f226c Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Mon, 21 Apr 2014 19:12:43 +0300
Subject: Use the new respond.js URL.

---
 docs/examples/grid/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/examples/grid')

diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index afd386d21..662c7af09 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -22,7 +22,7 @@
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
   </head>
 
-- 
cgit v1.2.3


From a84a3693b12f549e075424a63d34a83dc19d277b Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Thu, 24 Apr 2014 15:35:05 -0700
Subject: add ie-emulation-modes-warning.js to docs & examples

---
 docs/examples/grid/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/examples/grid')

diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 7e55b5b90..3d77f358a 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -16,8 +16,9 @@
     <!-- Custom styles for this template -->
     <link href="grid.css" rel="stylesheet">
 
-    <!-- Just for debugging purposes. Don't actually copy this line! -->
+    <!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
     <!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+    <script src="../../assets/js/ie-emulation-modes-warning.js"></script>
 
     <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
     <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
-- 
cgit v1.2.3


From ed98b3dfc012166d01c72fc80caa0113e37b4d45 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Sat, 10 May 2014 09:22:43 +0300
Subject: Update html5shiv to 3.7.2.

---
 docs/examples/grid/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/examples/grid')

diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 3d77f358a..6534834ee 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -25,7 +25,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
   </head>
-- 
cgit v1.2.3


From cae7dee2361c7023bd147570509a0c40ade3c4e9 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Thu, 22 May 2014 10:55:28 +0300
Subject: Revert 4f9270cc20c29cd3fbb0664379d620d14bb24a91.

The validator doesn't choke anymore on this and even though it's not spec compliant, it's needed for some IE versions. So until we move favicon.ico in root, this should do the job.
---
 docs/examples/grid/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/examples/grid')

diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 6534834ee..17a06c5e8 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="icon" href="../../assets/ico/favicon.ico">
+    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
 
     <title>Grid Template for Bootstrap</title>
 
-- 
cgit v1.2.3


From 29d00e0cd7285133c9260276acb0d99b02d6e3bc Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Tue, 25 Mar 2014 09:30:04 +0200
Subject: Move apple-touch-icon-precomposed.png and favicon.ico in docs root.

This way, it works in all browsers.
---
 docs/examples/grid/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/examples/grid')

diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 17a06c5e8..2dff5df9b 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Grid Template for Bootstrap</title>
 
-- 
cgit v1.2.3