diff options
| author | Mark Otto <[email protected]> | 2013-10-13 18:32:34 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-13 18:32:34 -0700 |
| commit | 265fda7903e189ee0d2d7201cc92bf384fc53043 (patch) | |
| tree | cf2249e0696d6ea2923678f9f7b155e265756f03 /_includes | |
| parent | a46003b8c7cc20bf4f72b7638a74643353ae047f (diff) | |
| parent | 727a91de1cdf5cbc4f25528e073480332a5940c5 (diff) | |
| download | bootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.tar.xz bootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.zip | |
Merge branch 'master' into restore_grid_mixins
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/footer.html | 2 | ||||
| -rw-r--r-- | _includes/header.html | 2 | ||||
| -rw-r--r-- | _includes/nav-css.html | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index 9e66c58a1..7f9f8f103 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,7 +1,7 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> -<script src="{{ page.base_url }}docs-assets/js/jquery.js"></script> +<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script> <script src="{{ page.base_url }}dist/js/bootstrap.js"></script> <script src="http://platform.twitter.com/widgets.js"></script> diff --git a/_includes/header.html b/_includes/header.html index 09f498bfb..b25f2cf43 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -21,7 +21,7 @@ <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> - <script src="{{ page.base_url }}docs-assets/js/html5shiv.js"></script> + <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script> <script src="{{ page.base_url }}docs-assets/js/respond.min.js"></script> <![endif]--> diff --git a/_includes/nav-css.html b/_includes/nav-css.html index ae5962c7c..543d004f3 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -12,6 +12,7 @@ <li> <a href="#grid">Grid system</a> <ul class="nav"> + <li><a href="#grid-intro">Introduction</a></li> <li><a href="#grid-media-queries">Media queries</a></li> <li><a href="#grid-options">Grid options</a></li> <li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li> @@ -79,6 +80,7 @@ <a href="#helper-classes">Helper classes</a> <ul class="nav"> <li><a href="#helper-classes-close">Close icon</a></li> + <li><a href="#helper-classes-carets">Carets</a></li> <li><a href="#helper-classes-floats">Quick floats</a></li> <li><a href="#helper-classes-center">Center content blocks</a></li> <li><a href="#helper-classes-clearfix">Clearfix</a></li> |