diff options
author | Mark Otto <markotto@twitter.com> | 2012-06-28 21:03:46 +0400 |
---|---|---|
committer | Mark Otto <markotto@twitter.com> | 2012-06-28 21:03:46 +0400 |
commit | c09e8473e2be483d3f53186840c002167647c44b (patch) | |
tree | 61b55f86591e679c03e80cfe062329b0b37f6ec5 /docs/templates/pages | |
parent | a683497dbc0f9cc3f883f195206e87589d09caaf (diff) |
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/templates/pages')
-rw-r--r-- | docs/templates/pages/base-css.mustache | 3 | ||||
-rw-r--r-- | docs/templates/pages/javascript.mustache | 45 |
2 files changed, 46 insertions, 2 deletions
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 583d0709ee..9b79c3d9c5 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1486,6 +1486,9 @@ </div> </div> + <h3>Glyphicons attribution</h3> + <p>{{_i}}<a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at not cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.{{/i}}</p> + <hr class="bs-docs-separator"> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index cc1ecf1cbb..a73917f5e3 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -773,11 +773,52 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <h1>{{_i}}Popovers{{/i}} <small>bootstrap-popover.js</small></h1> </div> - <h2>{{_i}}Example{{/i}}</h2> + <h2>{{_i}}Examples{{/i}}</h2> <p>{{_i}}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.{{/i}}</p> <p class="muted"><strong>*</strong> {{_i}}Requires <a href="#tooltips">Tooltip</a> to be included{{/i}}</p> + + <h3>{{_i}}Static popover{{/i}}</h3> + <p>{{_i}}Four options are available: top, right, bottom, and left aligned.{{/i}}</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>{{_i}}No markup shown as popovers are generated from javascript and content within a <code>data</code> attribute.{{/i}}</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?">{{_i}}hover for 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}}Hover for popover{{/i}}</a> </div> |