diff options
| author | Mark Otto <[email protected]> | 2012-12-05 11:05:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-05 11:05:10 -0800 |
| commit | 33e14fe5bfd7a7091ab491a961d66a2a2580f1de (patch) | |
| tree | 79c2c539e578877c3241e90402e47c4691c22a39 /docs/index.html | |
| parent | b3019d7aab877cccf03fda3e6894c0fdaa7330f3 (diff) | |
| parent | ed74992853054c57f33ef5d21941f0869e287552 (diff) | |
| download | bootstrap-33e14fe5bfd7a7091ab491a961d66a2a2580f1de.tar.xz bootstrap-33e14fe5bfd7a7091ab491a961d66a2a2580f1de.zip | |
Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
Diffstat (limited to 'docs/index.html')
| -rw-r--r-- | docs/index.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/index.html b/docs/index.html index 21f8948f0..8009c431f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -18,11 +18,11 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.png"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> - <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> + <link rel="shortcut icon" href="assets/ico/favicon.png"> </head> @@ -111,7 +111,7 @@ <div class="span4"> <img class="marketing-img" src="assets/img/bs-docs-bootstrap-features.png"> <h2>Packed with features.</h2> - <p>A 12-column responsive <a href="./scaffolding.html#grid">grid</a>, dozens of components, <a href="./javascript.html">JavaScript plugins</a>, typography, form controls, and even a <a href="./customize.html">web-based Customizer</a> to make Bootstrap your own.</p> + <p>A 12-column responsive <a href="./scaffolding.html#gridSystem">grid</a>, dozens of components, <a href="./javascript.html">JavaScript plugins</a>, typography, form controls, and even a <a href="./customize.html">web-based Customizer</a> to make Bootstrap your own.</p> </div> </div> |