diff options
| author | Mark Otto <otto@github.com> | 2014-01-12 02:48:04 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2014-01-12 02:48:04 +0400 |
| commit | e68d3b961e8fc4cadf1db378054d4f73bb99c81b (patch) | |
| tree | 648737183df14befed1661d215c613135fe5dbbe /docs/_includes | |
| parent | 7a2c352b501cfd6dafebe2115c767609ca212a25 (diff) | |
| parent | d06d61dc127c62a7f121de6c90498ce326db4b03 (diff) | |
Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets
Conflicts:
package.json
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/footer.html | 6 | ||||
| -rw-r--r-- | docs/_includes/header.html | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 352a9b1412..a9cff817e1 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -3,12 +3,8 @@ <!-- Placed at the end of the document so the pages load faster --> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> <script src="{{ site.baseurl }}dist/js/bootstrap.min.js"></script> - -<script src="{{ site.baseurl }}assets/js/holder.js"></script> -<script src="{{ site.baseurl }}assets/js/application.js"></script> - +<script src="{{ site.baseurl }}assets/js/docs.min.js"></script> {% if page.slug == "customize" %} -<script src="{{ site.baseurl }}assets/js/raw-files.js"></script> <script src="{{ site.baseurl }}assets/js/customize.min.js"></script> {% endif %} diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 3b64958974..9b1b5fddd1 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -17,8 +17,7 @@ <link href="{{ site.baseurl }}dist/css/bootstrap.min.css" rel="stylesheet"> <!-- Documentation extras --> -<link href="{{ site.baseurl }}assets/css/docs.css" rel="stylesheet"> -<link href="{{ site.baseurl }}assets/css/pygments-manni.css" rel="stylesheet"> +<link href="{{ site.baseurl }}assets/css/pack.min.css" rel="stylesheet"> <!--[if lt IE 9]><script src="{{ site.baseurl }}assets/js/ie8-responsive-file-warning.js"></script><![endif]--> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> |