rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into docs_derp

Browse source 
Conflicts:
	docs/getting-started.html
This commit is contained in:
Mark Otto 2014-01-11 19:13:10 -08:00
commit bacfd65cb2
20 changed files with 94 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/_includes/footer.html
View file

@ -30,12 +30,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 %}

3
docs/_includes/header.html
View file

@ -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 -->