From f14113133d8108e544996dbfe19e470ddf991919 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sun, 6 Sep 2015 12:16:01 +0300
Subject: [PATCH 1/2] Remove `gem install scss_lint` from Travis.

Instead, use `bundleExec: true` for grunt-scss-lint.
---
 .travis.yml  | 1 -
 Gruntfile.js | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6fbd2a3d81..1d48a5ac7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,6 @@ before_install:
   - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi
 install:
   - bundle install --deployment --jobs=3
-  - gem install scss_lint --no-rdoc --no-ri
   - npm install -g grunt-cli
   - npm install
 cache:
diff --git a/Gruntfile.js b/Gruntfile.js
index b209223243..e4d0e43e7c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -206,6 +206,7 @@ module.exports = function (grunt) {
     // CSS build configuration
     scsslint: {
       options: {
+        bundleExec: true,
         config: 'scss/.scsslint.yml',
         reporterOutput: null
       },

From 87a3fdd1b716aefef8272994ea3f6f32601deaae Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sun, 6 Sep 2015 12:16:01 +0300
Subject: [PATCH 2/2] Clean up inclusion of IE-specific JS files.

Move them to footer, and remove duplicate ones.

[ci skip]
---
 docs/_includes/footer.html                    | 1 +
 docs/_includes/header.html                    | 4 ----
 docs/examples/album/index.html                | 5 ++---
 docs/examples/blog/index.html                 | 3 ---
 docs/examples/carousel/index.html             | 3 ---
 docs/examples/cover/index.html                | 3 ---
 docs/examples/dashboard/index.html            | 3 ---
 docs/examples/grid/index.html                 | 5 ++---
 docs/examples/jumbotron/index.html            | 5 ++---
 docs/examples/justified-nav/index.html        | 5 ++---
 docs/examples/narrow-jumbotron/index.html     | 5 ++---
 docs/examples/navbar-top-fixed/index.html     | 5 ++---
 docs/examples/navbar-top/index.html           | 5 ++---
 docs/examples/navbar/index.html               | 5 ++---
 docs/examples/offcanvas/index.html            | 3 ---
 docs/examples/signin/index.html               | 5 ++---
 docs/examples/starter-template/index.html     | 5 ++---
 docs/examples/sticky-footer-navbar/index.html | 5 ++---
 docs/examples/sticky-footer/index.html        | 5 ++---
 docs/examples/tooltip-viewport/index.html     | 3 ---
 20 files changed, 25 insertions(+), 58 deletions(-)

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 3e12c58b8b..eb35020baf 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -30,6 +30,7 @@
 
 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 <script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script>
+<script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
 
 {% if page.layout == "docs" %}
 <script src="{{ site.baseurl }}/assets/js/vendor/jekyll-search.js"></script>
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index bba5aad3d5..e637dc4700 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -19,10 +19,6 @@
 <!-- Documentation extras -->
 <link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">
 
-<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-<script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script>
-<script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
-
 <!-- Favicons -->
 <link rel="apple-touch-icon" href="{{ site.baseurl }}/apple-touch-icon.png">
 <link rel="icon" href="{{ site.baseurl }}/favicon.ico">
diff --git a/docs/examples/album/index.html b/docs/examples/album/index.html
index 5c3c0ea771..557f57ec2c 100644
--- a/docs/examples/album/index.html
+++ b/docs/examples/album/index.html
@@ -15,9 +15,6 @@
 
     <!-- Custom styles for this template -->
     <link href="album.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -126,5 +123,7 @@
       });
     </script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html
index b1acf85ef6..a598f8413d 100644
--- a/docs/examples/blog/index.html
+++ b/docs/examples/blog/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="blog.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
index 9c6ae35d97..d347865401 100644
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@@ -14,9 +14,6 @@
     <!-- Bootstrap core CSS -->
     <link href="../../dist/css/bootstrap.min.css" rel="stylesheet">
 
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
-
     <!-- Custom styles for this template -->
     <link href="carousel.css" rel="stylesheet">
   </head>
diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html
index e7c7539a92..54b0d705a9 100644
--- a/docs/examples/cover/index.html
+++ b/docs/examples/cover/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="cover.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index 6d92f41ae1..b51f2d86e3 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="dashboard.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 3c4c68df6c..c64b37dc5c 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="grid.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -176,5 +173,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html
index 37ddabf4bf..674c5c2b50 100644
--- a/docs/examples/jumbotron/index.html
+++ b/docs/examples/jumbotron/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="jumbotron.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -81,5 +78,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/justified-nav/index.html b/docs/examples/justified-nav/index.html
index ad3de83520..b0d37f4645 100644
--- a/docs/examples/justified-nav/index.html
+++ b/docs/examples/justified-nav/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="justified-nav.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -79,5 +76,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/narrow-jumbotron/index.html b/docs/examples/narrow-jumbotron/index.html
index 3a52a710d1..86c732ba7a 100644
--- a/docs/examples/narrow-jumbotron/index.html
+++ b/docs/examples/narrow-jumbotron/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="narrow-jumbotron.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -81,5 +78,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/navbar-top-fixed/index.html b/docs/examples/navbar-top-fixed/index.html
index b5caa644d9..c716bec7de 100644
--- a/docs/examples/navbar-top-fixed/index.html
+++ b/docs/examples/navbar-top-fixed/index.html
@@ -15,9 +15,6 @@
 
     <!-- Custom styles for this template -->
     <link href="navbar-top-fixed.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -50,5 +47,7 @@
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/navbar-top/index.html b/docs/examples/navbar-top/index.html
index f54f5eafd0..87c73d56d5 100644
--- a/docs/examples/navbar-top/index.html
+++ b/docs/examples/navbar-top/index.html
@@ -15,9 +15,6 @@
 
     <!-- Custom styles for this template -->
     <link href="navbar-top.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -48,5 +45,7 @@
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html
index 51328c7953..53269a094f 100644
--- a/docs/examples/navbar/index.html
+++ b/docs/examples/navbar/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="navbar.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -70,5 +67,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html
index 5382011f7f..6dc7c044cc 100644
--- a/docs/examples/offcanvas/index.html
+++ b/docs/examples/offcanvas/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="offcanvas.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
diff --git a/docs/examples/signin/index.html b/docs/examples/signin/index.html
index 9fb60b33c0..6a7b99c2ff 100644
--- a/docs/examples/signin/index.html
+++ b/docs/examples/signin/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="signin.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -45,5 +42,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html
index 84b3bdec6d..ca82debb21 100644
--- a/docs/examples/starter-template/index.html
+++ b/docs/examples/starter-template/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="starter-template.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -54,5 +51,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html
index 56408c6a8a..fc41d08b43 100644
--- a/docs/examples/sticky-footer-navbar/index.html
+++ b/docs/examples/sticky-footer-navbar/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="sticky-footer-navbar.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -79,5 +76,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/sticky-footer/index.html b/docs/examples/sticky-footer/index.html
index dd5b4e39a7..9dcb7a8ef9 100644
--- a/docs/examples/sticky-footer/index.html
+++ b/docs/examples/sticky-footer/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="sticky-footer.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -42,5 +39,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html
index e5773948cd..7327331e13 100644
--- a/docs/examples/tooltip-viewport/index.html
+++ b/docs/examples/tooltip-viewport/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="tooltip-viewport.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>