Skip to content

B
bootstrap
Commit bcc6fe5b authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

parents b0225c07 af902828
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
assets/css/docs.css
View file @ bcc6fe5b
...@@ -388,7 +388,6 @@ body { ...@@ -388,7 +388,6 @@ body {
.bs-example-type .table td { .bs-example-type .table td {
color: #999; color: #999;
vertical-align: middle; vertical-align: middle;
border-color: ;
} }
.bs-example-type .table td, .bs-example-type .table td,
.bs-example-type .table th { .bs-example-type .table th {
......
javascript.html
View file @ bcc6fe5b
...@@ -742,10 +742,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { ...@@ -742,10 +742,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
<h3>Four directions</h3> <h3>Four directions</h3>
<div class="bs-example tooltip-demo"> <div class="bs-example tooltip-demo">
<div class="bs-example-tooltips"> <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="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="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>
</div><!-- /example --> </div><!-- /example -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment