mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-20 20:31:26 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source
This commit is contained in:
Mark Otto
2013-05-07 10:33:49 -07:00
parent f06294d80f bb307243de
commit 79dac4b77a
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -35,7 +35,7 @@ Have a bug or a feature request? [Please open a new issue](https://github.com/tw
## Documentation ## Documentation
Bootstrap's docs are built using [Jekyll](http://jekyllrb.com) and hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). To view our docs locally, you'll need to [install Jekyll](https://github.com/mojombo/jekyll/wiki/install) to run a local server. Bootstrap's docs are built using [Jekyll](http://jekyllrb.com) and hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). To view our docs locally, you'll need to [install Jekyll](http://jekyllrb.com/docs/installation) to run a local server.
Documentation for [previous versions](https://github.com/twitter/bootstrap/tags) is also available via tags. Documentation for [previous versions](https://github.com/twitter/bootstrap/tags) is also available via tags.

4
docs/docs.html
View File

@@ -5119,11 +5119,11 @@ $('#myModal').on('show', function (e) {
<a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a> <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a>
</div><!-- /example --> </div><!-- /example -->
{% highlight html %} {% highlight html %}
<div class="modal">
<!-- Button trigger modal --> <!-- Button trigger modal -->
<a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a> <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a>
<!-- Modal --> <!-- Modal -->
<div class="modal" id="myModal">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@@ -5139,7 +5139,7 @@ $('#myModal').on('show', function (e) {
</div> </div>
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
</div><!-- /.modal-dalog --> </div><!-- /.modal-dalog -->
</div><!-- /.modal --> </div><!-- /.modal -->
{% endhighlight %} {% endhighlight %}