mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-17 09:52:29 +01:00
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
This commit is contained in:
commit
bcc6fe5b2b
@ -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 {
|
||||||
|
@ -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="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="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="bottom" title="Tooltip on bottom">Tooltip on bottom</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 -->
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user