aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-06-28 10:03:46 -0700
committerMark Otto <[email protected]>2012-06-28 10:03:46 -0700
commitc09e8473e2be483d3f53186840c002167647c44b (patch)
tree61b55f86591e679c03e80cfe062329b0b37f6ec5 /docs/javascript.html
parenta683497dbc0f9cc3f883f195206e87589d09caaf (diff)
downloadbootstrap-c09e8473e2be483d3f53186840c002167647c44b.tar.xz
bootstrap-c09e8473e2be483d3f53186840c002167647c44b.zip
use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html45
1 files changed, 43 insertions, 2 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index bc82711fb..7fb1448ec 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -848,11 +848,52 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h1>Popovers <small>bootstrap-popover.js</small></h1>
</div>
- <h2>Example</h2>
+ <h2>Examples</h2>
<p>Add small overlays of content, like those on the iPad, to any element for housing secondary information. Hover over the button to trigger the popover.</p>
<p class="muted"><strong>*</strong> Requires <a href="#tooltips">Tooltip</a> to be included</p>
+
+ <h3>Static popover</h3>
+ <p>Four options are available: top, right, bottom, and left aligned.</p>
+ <div class="bs-docs-example bs-docs-example-popover">
+ <div class="popover top">
+ <div class="arrow"></div>
+ <h3 class="popover-title">Popover top</h3>
+ <div class="popover-content">
+ <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+ </div>
+ </div>
+
+ <div class="popover right">
+ <div class="arrow"></div>
+ <h3 class="popover-title">Popover right</h3>
+ <div class="popover-content">
+ <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+ </div>
+ </div>
+
+ <div class="popover bottom">
+ <div class="arrow"></div>
+ <h3 class="popover-title">Popover bottom</h3>
+ <div class="popover-content">
+ <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+ </div>
+ </div>
+
+ <div class="popover left">
+ <div class="arrow"></div>
+ <h3 class="popover-title">Popover left</h3>
+ <div class="popover-content">
+ <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+ </div>
+ </div>
+
+ <div class="clearfix"></div>
+ </div>
+ <p>No markup shown as popovers are generated from javascript and content within a <code>data</code> attribute.</p>
+
+ <h3>Live demo</h3>
<div class="bs-docs-example" style="padding-bottom: 24px;">
- <a href="#" class="btn btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">hover for 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?">Hover for popover</a>
</div>