diff options
| author | Mark Otto <[email protected]> | 2011-07-01 22:16:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-07-01 22:16:29 -0700 |
| commit | 163e68ade6eb9e1a8a2e52aadf975612ab850579 (patch) | |
| tree | 6071bb83bfb00173196f32e1f847e63537822691 /docs/index.html | |
| parent | 7962b36dae6d0d793e2bfa04d69ae1a2e5dbd611 (diff) | |
| parent | 26f9e8c4e8580c2d41f31a4fb504ee8c0fdeb145 (diff) | |
| download | bootstrap-163e68ade6eb9e1a8a2e52aadf975612ab850579.tar.xz bootstrap-163e68ade6eb9e1a8a2e52aadf975612ab850579.zip | |
resolve merge conflict
Diffstat (limited to 'docs/index.html')
| -rw-r--r-- | docs/index.html | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/docs/index.html b/docs/index.html index d1b924181..1caea7c8f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -265,8 +265,10 @@ <h6>h6. Heading 6</h6> </div> <div class="span6 columns"> - <h3>Example paragraph (body text)</h3> + <h3>Example paragraph</h3> <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> + <h1>Example heading<small>Has sub-heading...</small></h1> + <p>You can also add subheadings with the <code><strong></code> and <code><em></code></p> </div> </div> @@ -1080,6 +1082,37 @@ </div> </div> </div> + <div class="row"> + <div class="span4 columns"> + <h2>Tool Tips</h2> + <p>Twipsies are super useful for aiding a confused user and pointing them in the right direction.</p> + </div> + <div class="span12 columns"> + <div class="twipsies well"> + <div style="position: relative"> + <p class="muted" style="margin-bottom: 0"> +Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> veritatis aut iste perspiciatis iste voluptas natus illo quasi odit aut natus consequuntur consequuntur, aut natus illo voluptatem odit perspiciatis laudantium rem doloremque totam voluptas. <a href="#" title="right">Voluptasdicta</a> eaque beatae aperiam ut enim voluptatem explicabo explicabo, voluptas quia odit fugit accusantium totam totam architecto explicabo sit quasi fugit fugit, totam doloremque unde sunt <a href="#" title="left">sed</a> dicta quae accusantium fugit voluptas nemo voluptas voluptatem <a href="#" title="above">rem</a> quae aut veritatis quasi quae. + </p> + <div class="twipsy below"> + <div class="twipsy-arrow"></div> + <div class="twipsy-inner">below!</div> + </div> + <div class="twipsy right"> + <div class="twipsy-arrow"></div> + <div class="twipsy-inner">right!</div> + </div> + <div class="twipsy left"> + <div class="twipsy-arrow"></div> + <div class="twipsy-inner">left!</div> + </div> + <div class="twipsy above"> + <div class="twipsy-arrow"></div> + <div class="twipsy-inner">above!</div> + </div> + </div> + </div> + </div> + </div> </div> </section> |