Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets

Conflicts:
	package.json

2 files changed, 2 insertions, 7 deletions

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 352a9b141..a9cff817e 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 3b6495897..9b1b5fddd 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 -->