Commit cedb3c7c authored by Mark Otto's avatar Mark Otto
Browse files

fixes #5173: proper popover offsets; added docs examples to enable tests in the future

parent 783f4885
6 merge requests!5565Boostraptest,!5450Fixed copy and paste caused typo in CAROUSEL DATA-API,!5326Replace watchr with node-supervisor,!5277Please delete,!5195Replace .remove() with .detach() in bootstrap-tooltip.js,!5042Pagination Javascript Component
Showing with 24 additions and 4 deletions
+24 -4
...@@ -5109,7 +5109,7 @@ input[type="submit"].btn.btn-mini { ...@@ -5109,7 +5109,7 @@ input[type="submit"].btn.btn-mini {
} }
.popover.top { .popover.top {
margin-bottom: 10px; margin-top: -10px;
} }
.popover.right { .popover.right {
...@@ -5121,7 +5121,7 @@ input[type="submit"].btn.btn-mini { ...@@ -5121,7 +5121,7 @@ input[type="submit"].btn.btn-mini {
} }
.popover.left { .popover.left {
margin-right: 10px; margin-left: -10px;
} }
.popover-title { .popover-title {
......
...@@ -925,6 +925,16 @@ $('a[data-toggle="tab"]').on('shown', function (e) { ...@@ -925,6 +925,16 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Click to toggle popover</a> <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Click to toggle popover</a>
</div> </div>
<h4>Four directions</h4>
<div class="bs-docs-example tooltip-demo">
<ul class="bs-docs-tooltip-examples">
<li><a href="#" class="btn" rel="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on top">Popover on top</a></li>
<li><a href="#" class="btn" rel="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on right">Popover on right</a></li>
<li><a href="#" class="btn" rel="popover" data-placement="bottom" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on bottom">Popover on bottom</a></li>
<li><a href="#" class="btn" rel="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on left">Popover on left</a></li>
</ul>
</div>
<hr class="bs-docs-separator"> <hr class="bs-docs-separator">
......
...@@ -855,6 +855,16 @@ $('a[data-toggle="tab"]').on('shown', function (e) { ...@@ -855,6 +855,16 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">{{_i}}Click to toggle popover{{/i}}</a> <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">{{_i}}Click to toggle popover{{/i}}</a>
</div> </div>
<h4>{{_i}}Four directions{{/i}}</h4>
<div class="bs-docs-example tooltip-demo">
<ul class="bs-docs-tooltip-examples">
<li><a href="#" class="btn" rel="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on top">Popover on top</a></li>
<li><a href="#" class="btn" rel="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on right">Popover on right</a></li>
<li><a href="#" class="btn" rel="popover" data-placement="bottom" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on bottom">Popover on bottom</a></li>
<li><a href="#" class="btn" rel="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on left">Popover on left</a></li>
</ul>
</div>{{! /example }}
<hr class="bs-docs-separator"> <hr class="bs-docs-separator">
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
.box-shadow(0 5px 10px rgba(0,0,0,.2)); .box-shadow(0 5px 10px rgba(0,0,0,.2));
// Offset the popover to account for the popover arrow // Offset the popover to account for the popover arrow
&.top { margin-bottom: 10px; } &.top { margin-top: -10px; }
&.right { margin-left: 10px; } &.right { margin-left: 10px; }
&.bottom { margin-top: 10px; } &.bottom { margin-top: 10px; }
&.left { margin-right: 10px; } &.left { margin-left: -10px; }
} }
......
Supports Markdown
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