diff options
| author | fat <[email protected]> | 2012-12-21 20:20:04 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2012-12-21 20:20:04 -0800 |
| commit | f59bf470810c3be7867f6212bb0f20b97509d800 (patch) | |
| tree | 24bfee88bc720998214c1ffe313920b3e0d33375 | |
| parent | ddd59f22c7d6e3df7f7e427febc1d08035e0ec8b (diff) | |
| parent | 7f7039321d9078ff7127b56aabe6be0e85716350 (diff) | |
| download | bootstrap-f59bf470810c3be7867f6212bb0f20b97509d800.tar.xz bootstrap-f59bf470810c3be7867f6212bb0f20b97509d800.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
| -rw-r--r-- | README.md | 20 | ||||
| -rw-r--r-- | docs/assets/img/bootstrap-docs-readme.png | bin | 0 -> 30612 bytes | |||
| -rw-r--r-- | docs/examples/carousel.html | 1 |
3 files changed, 13 insertions, 8 deletions
@@ -1,8 +1,12 @@ -# [Twitter Bootstrap v2.2.3](http://twitter.github.com/bootstrap) [](http://travis-ci.org/twitter/bootstrap) +<a href="http://getbootstrap.com"> + <img src="http://twitter.github.com/bootstrap/assets/img/bootstrap-docs-readme.png" width="100px"> +</a> + +# [Bootstrap v2.2.3](http://twitter.github.com/bootstrap) [](http://travis-ci.org/twitter/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat). -To get started, checkout http://getbootstrap.com! +To get started, checkout [http://getbootstrap.com](http://getbootstrap.com)! @@ -30,7 +34,7 @@ And constructed with the following guidelines: * New additions without breaking backward compatibility bumps the minor (and resets the patch) * Bug fixes and misc changes bumps the patch -For more information on SemVer, please visit http://semver.org/. +For more information on SemVer, please visit [http://semver.org/](http://semver.org/). @@ -85,13 +89,13 @@ Thanks! **Mark Otto** -+ http://twitter.com/mdo -+ http://github.com/mdo ++ [http://twitter.com/mdo](http://twitter.com/mdo) ++ [http://github.com/mdo](http://github.com/mdo) **Jacob Thornton** -+ http://twitter.com/fat -+ http://github.com/fat ++ [http://twitter.com/fat](http://twitter.com/fat) ++ [http://github.com/fat](http://github.com/fat) @@ -103,7 +107,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License in the LICENSE file, or at: - http://www.apache.org/licenses/LICENSE-2.0 + [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/docs/assets/img/bootstrap-docs-readme.png b/docs/assets/img/bootstrap-docs-readme.png Binary files differnew file mode 100644 index 000000000..36603bd3b --- /dev/null +++ b/docs/assets/img/bootstrap-docs-readme.png diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 0958103fc..2a0cadec1 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -448,5 +448,6 @@ }) }(window.jQuery) </script> + <script src="../assets/js/holder/holder.js"></script> </body> </html> |
