diff options
| author | Jacob Thornton <[email protected]> | 2011-09-16 11:24:07 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-16 11:24:07 -0700 |
| commit | c7c5ce8dcd4cc6c56bc64007bf31b93760dbf2ee (patch) | |
| tree | 75c97593b25066d9c2d7bd76eef24e23d1f106d3 /README.md | |
| parent | aa432390888bae158bbc3014eed9af55103d03aa (diff) | |
| parent | 427a001c476569684027567e5a7cec89058185ad (diff) | |
| download | bootstrap-c7c5ce8dcd4cc6c56bc64007bf31b93760dbf2ee.tar.xz bootstrap-c7c5ce8dcd4cc6c56bc64007bf31b93760dbf2ee.zip | |
Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
Makefile
README.md
bootstrap.css
bootstrap.min.css
lib/bootstrap.less
lib/scaffolding.less
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 24 |
1 files changed, 17 insertions, 7 deletions
@@ -13,12 +13,16 @@ You can use Twitter Bootstrap in one of two ways: just drop the compiled CSS int Here's what the LESS version looks like: - <link rel="stylesheet/less" type="text/css" href="lib/bootstrap.less"> - <script src="less.js" type="text/javascript"></script> +``` html +<link rel="stylesheet/less" type="text/css" href="lib/bootstrap.less"> +<script src="less.js" type="text/javascript"></script> +``` Or if you prefer, the standard css way: +``` html <link rel="stylesheet" type="text/css" href="bootstrap.css"> +``` For more info, refer to the docs! @@ -41,7 +45,7 @@ And constructed with the following guidelines: For more information on SemVer, please visit http://semver.org/. -Bug Tracker +Bug tracker ----------- Have a bug? Please create an issue here on GitHub! @@ -49,7 +53,13 @@ Have a bug? Please create an issue here on GitHub! https://github.com/twitter/bootstrap/issues -Mailing List +Twitter account +--------------- + +Keep up to date on announcements and more by following Bootstrap on Twitter, <a href="http://twitter.com/TwBootstrap">@TwBootstrap</a>. + + +Mailing list ------------ Have a question? Ask on our mailing list! @@ -73,7 +83,7 @@ This is a convenience method for watching your less files and automatically buil Watchr is required for this command to run. -AUTHORS +Authors ------- **Mark Otto** @@ -87,7 +97,7 @@ AUTHORS + http://github.com/fat -Copyright and License +Copyright and license --------------------- Copyright 2011 Twitter, Inc. @@ -102,4 +112,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License.
\ No newline at end of file +limitations under the License. |