diff options
| author | Mark Otto <[email protected]> | 2013-07-28 22:00:55 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-28 22:00:55 -0700 |
| commit | bcc6fe5b2bf6bba6a32f0a1b9bc3f129286f70fb (patch) | |
| tree | a334125fb8597b2ea4b07e139d41ac7ebe339535 | |
| parent | b0225c073a714c8172d6d59f9b21fc669f1cf747 (diff) | |
| parent | af90282858daedfd226c71e7b678f93fa37cdd98 (diff) | |
| download | bootstrap-bcc6fe5b2bf6bba6a32f0a1b9bc3f129286f70fb.tar.xz bootstrap-bcc6fe5b2bf6bba6a32f0a1b9bc3f129286f70fb.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
| -rw-r--r-- | assets/css/docs.css | 1 | ||||
| -rw-r--r-- | javascript.html | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/assets/css/docs.css b/assets/css/docs.css index 5228cad63..4cbe895ea 100644 --- a/assets/css/docs.css +++ b/assets/css/docs.css @@ -388,7 +388,6 @@ body { .bs-example-type .table td { color: #999; vertical-align: middle; - border-color: ; } .bs-example-type .table td, .bs-example-type .table th { diff --git a/javascript.html b/javascript.html index 10e469b44..86aef097d 100644 --- a/javascript.html +++ b/javascript.html @@ -742,10 +742,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { <h3>Four directions</h3> <div class="bs-example tooltip-demo"> <div class="bs-example-tooltips"> + <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Tooltip on left">Tooltip on left</button> <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Tooltip on top">Tooltip on top</button> - <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="Tooltip on right">Tooltip on right</button> <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom">Tooltip on bottom</button> - <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Tooltip on left">Tooltip on left</button> + <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="Tooltip on right">Tooltip on right</button> </div> </div><!-- /example --> |