Merge branch 'master' of github.com:twbs/bootstrap

14 files changed, 39 insertions, 15 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index 8c62d6da1..b3b21448f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -59,7 +59,7 @@ module.exports = function (grunt) {
         src: 'js/tests/unit/*.js'
       },
       assets: {
-        src: ['docs/assets/js/_src/*.js', 'docs/assets/js/*.js', '!docs/assets/js/*.min.js']
+        src: ['docs/assets/js/src/*.js', 'docs/assets/js/*.js', '!docs/assets/js/*.min.js']
       }
     },
 
@@ -118,21 +118,22 @@ module.exports = function (grunt) {
       },
       customize: {
         src: [
-          'docs/assets/js/_vendor/less.min.js',
-          'docs/assets/js/_vendor/jszip.min.js',
-          'docs/assets/js/_vendor/uglify.min.js',
-          'docs/assets/js/_vendor/blob.js',
-          'docs/assets/js/_vendor/filesaver.js',
+          'docs/assets/js/vendor/less.min.js',
+          'docs/assets/js/vendor/jszip.min.js',
+          'docs/assets/js/vendor/uglify.min.js',
+          'docs/assets/js/vendor/blob.js',
+          'docs/assets/js/vendor/filesaver.js',
           'docs/assets/js/raw-files.min.js',
-          'docs/assets/js/_src/customizer.js'
+          'docs/assets/js/src/customizer.js'
         ],
         dest: 'docs/assets/js/customize.min.js'
       },
       docsJs: {
+        // NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too.
         src: [
-          'docs/assets/js/_vendor/holder.js',
-          'docs/assets/js/_vendor/ZeroClipboard.min.js',
-          'docs/assets/js/_src/application.js'
+          'docs/assets/js/vendor/holder.js',
+          'docs/assets/js/vendor/ZeroClipboard.min.js',
+          'docs/assets/js/src/application.js'
         ],
         dest: 'docs/assets/js/docs.min.js'
       }
@@ -198,7 +199,7 @@ module.exports = function (grunt) {
         src: 'dist/css/<%= pkg.name %>-theme.css'
       },
       docs: {
-        src: 'docs/assets/css/_src/docs.css'
+        src: 'docs/assets/css/src/docs.css'
       },
       examples: {
         expand: true,
@@ -224,7 +225,7 @@ module.exports = function (grunt) {
           ids: false,
           'overqualified-elements': false
         },
-        src: 'docs/assets/css/_src/docs.css'
+        src: 'docs/assets/css/src/docs.css'
       }
     },
 
@@ -242,8 +243,8 @@ module.exports = function (grunt) {
       },
       docs: {
         src: [
-          'docs/assets/css/_src/docs.css',
-          'docs/assets/css/_src/pygments-manni.css'
+          'docs/assets/css/src/docs.css',
+          'docs/assets/css/src/pygments-manni.css'
         ],
         dest: 'docs/assets/css/docs.min.css'
       }
@@ -277,7 +278,7 @@ module.exports = function (grunt) {
       },
       docs: {
         files: {
-          'docs/assets/css/_src/docs.css': 'docs/assets/css/_src/docs.css'
+          'docs/assets/css/src/docs.css': 'docs/assets/css/src/docs.css'
         }
       }
     },
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 0bb3eafd3..f962d19cc 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -33,8 +33,18 @@
 ================================================== -->
 <!-- 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>
+{% if site.github %}
 <script src="../dist/js/bootstrap.min.js"></script>
+{% else %}
+<script src="../dist/js/bootstrap.js"></script>
+{% endif %}
+{% if site.github %}
 <script src="../assets/js/docs.min.js"></script>
+{% else %}
+<script src="../assets/js/vendor/holder.js"></script>
+<script src="../assets/js/vendor/ZeroClipboard.min.js"></script>
+<script src="../assets/js/src/application.js"></script>
+{% endif %}
 {% if page.slug == "customize" %}
 <script src="../assets/js/customize.min.js"></script>
 {% endif %}
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index e60853ef4..6a40f7382 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -14,14 +14,27 @@
 </title>
 
 <!-- Bootstrap core CSS -->
+{% if site.github %}
 <link href="../dist/css/bootstrap.min.css" rel="stylesheet">
+{% else %}
+<link href="../dist/css/bootstrap.css" rel="stylesheet">
+{% endif %}
 {% if page.slug == "css" or page.slug == "components" or page.slug == "js" %}
   <!-- Optional Bootstrap Theme -->
+{% if site.github %}
   <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.min.css" rel="stylesheet" id="bs-theme-stylesheet">
+{% else %}
+  <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.css" rel="stylesheet" id="bs-theme-stylesheet">
+{% endif %}
 {% endif %}
 
 <!-- Documentation extras -->
+{% if site.github %}
 <link href="../assets/css/docs.min.css" rel="stylesheet">
+{% else %}
+<link href="../assets/css/src/docs.css" rel="stylesheet">
+<link href="../assets/css/src/pygments-manni.css" rel="stylesheet">
+{% endif %}
 <!--[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>
diff --git a/docs/assets/css/_src/docs.css b/docs/assets/css/src/docs.css
index f58c1e98e..f58c1e98e 100644
--- a/docs/assets/css/_src/docs.css
+++ b/docs/assets/css/src/docs.css
diff --git a/docs/assets/css/_src/pygments-manni.css b/docs/assets/css/src/pygments-manni.css
index 1b3c92cb2..1b3c92cb2 100644
--- a/docs/assets/css/_src/pygments-manni.css
+++ b/docs/assets/css/src/pygments-manni.css
diff --git a/docs/assets/js/_src/application.js b/docs/assets/js/src/application.js
index 792fc9779..792fc9779 100644
--- a/docs/assets/js/_src/application.js
+++ b/docs/assets/js/src/application.js
diff --git a/docs/assets/js/_src/customizer.js b/docs/assets/js/src/customizer.js
index c3a212f2c..c3a212f2c 100644
--- a/docs/assets/js/_src/customizer.js
+++ b/docs/assets/js/src/customizer.js
diff --git a/docs/assets/js/_vendor/ZeroClipboard.min.js b/docs/assets/js/vendor/ZeroClipboard.min.js
index 564023407..564023407 100644
--- a/docs/assets/js/_vendor/ZeroClipboard.min.js
+++ b/docs/assets/js/vendor/ZeroClipboard.min.js
diff --git a/docs/assets/js/_vendor/blob.js b/docs/assets/js/vendor/blob.js
index 4bdfd4409..4bdfd4409 100644
--- a/docs/assets/js/_vendor/blob.js
+++ b/docs/assets/js/vendor/blob.js
diff --git a/docs/assets/js/_vendor/filesaver.js b/docs/assets/js/vendor/filesaver.js
index 6095017e9..6095017e9 100644
--- a/docs/assets/js/_vendor/filesaver.js
+++ b/docs/assets/js/vendor/filesaver.js
diff --git a/docs/assets/js/_vendor/holder.js b/docs/assets/js/vendor/holder.js
index d2fe17fea..d2fe17fea 100644
--- a/docs/assets/js/_vendor/holder.js
+++ b/docs/assets/js/vendor/holder.js
diff --git a/docs/assets/js/_vendor/jszip.min.js b/docs/assets/js/vendor/jszip.min.js
index 54b6a09e9..54b6a09e9 100644
--- a/docs/assets/js/_vendor/jszip.min.js
+++ b/docs/assets/js/vendor/jszip.min.js
diff --git a/docs/assets/js/_vendor/less.min.js b/docs/assets/js/vendor/less.min.js
index 3cecd957d..3cecd957d 100644
--- a/docs/assets/js/_vendor/less.min.js
+++ b/docs/assets/js/vendor/less.min.js
diff --git a/docs/assets/js/_vendor/uglify.min.js b/docs/assets/js/vendor/uglify.min.js
index 3b6805eb5..3b6805eb5 100644
--- a/docs/assets/js/_vendor/uglify.min.js
+++ b/docs/assets/js/vendor/uglify.min.js