diff options
| author | Chris Rebert <[email protected]> | 2014-07-07 19:36:32 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-07-07 19:36:32 -0700 |
| commit | 5d1abf8b380aa94be26f52a662636cc6501fec2d (patch) | |
| tree | a4aa4ebe527e6bd8c444c274689469bacac01b1e /docs | |
| parent | c7c2a078ddf39c582dca283384814ccd7aa5f94d (diff) | |
| parent | 1dc54dc160d4352d894550c7c5d3f68c475ba2cf (diff) | |
| download | bootstrap-5d1abf8b380aa94be26f52a662636cc6501fec2d.tar.xz bootstrap-5d1abf8b380aa94be26f52a662636cc6501fec2d.zip | |
Merge pull request #14036 from twbs/fix-13575
Jekyll: Use non-minified assets when not running from GitHub Pages
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_includes/footer.html | 10 | ||||
| -rw-r--r-- | docs/_includes/header.html | 13 | ||||
| -rw-r--r-- | docs/assets/css/src/docs.css (renamed from docs/assets/css/_src/docs.css) | 0 | ||||
| -rw-r--r-- | docs/assets/css/src/pygments-manni.css (renamed from docs/assets/css/_src/pygments-manni.css) | 0 | ||||
| -rw-r--r-- | docs/assets/js/src/application.js (renamed from docs/assets/js/_src/application.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/src/customizer.js (renamed from docs/assets/js/_src/customizer.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/ZeroClipboard.min.js (renamed from docs/assets/js/_vendor/ZeroClipboard.min.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/blob.js (renamed from docs/assets/js/_vendor/blob.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/filesaver.js (renamed from docs/assets/js/_vendor/filesaver.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/holder.js (renamed from docs/assets/js/_vendor/holder.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/jszip.min.js (renamed from docs/assets/js/_vendor/jszip.min.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/less.min.js (renamed from docs/assets/js/_vendor/less.min.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/uglify.min.js (renamed from docs/assets/js/_vendor/uglify.min.js) | 0 |
13 files changed, 23 insertions, 0 deletions
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 |
