diff options
| author | Mark Otto <[email protected]> | 2011-07-29 13:10:33 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-07-29 13:10:33 -0700 |
| commit | 88bd6f72daaeb1cada7dab852e6f779af7b33823 (patch) | |
| tree | dd085c6b2f7c8c2e0c977525d37771554c269c54 /docs | |
| parent | 68d4b85ffc542ef85eb4fe1bfba7acf6d504f522 (diff) | |
| parent | 7f99892b864295eef23bf24bd8c6c9b231d0c684 (diff) | |
| download | bootstrap-88bd6f72daaeb1cada7dab852e6f779af7b33823.tar.xz bootstrap-88bd6f72daaeb1cada7dab852e6f779af7b33823.zip | |
resolve compiled css merge prob, refine few small things
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/.DS_Store | bin | 0 -> 6148 bytes | |||
| -rw-r--r-- | docs/assets/.DS_Store | bin | 0 -> 6148 bytes | |||
| -rw-r--r-- | docs/assets/css/docs.css | 10 | ||||
| -rw-r--r-- | docs/assets/img/bird.png | bin | 0 -> 4434 bytes | |||
| -rw-r--r-- | docs/index.html | 39 |
5 files changed, 17 insertions, 32 deletions
diff --git a/docs/.DS_Store b/docs/.DS_Store Binary files differnew file mode 100644 index 000000000..f199fc7b1 --- /dev/null +++ b/docs/.DS_Store diff --git a/docs/assets/.DS_Store b/docs/assets/.DS_Store Binary files differnew file mode 100644 index 000000000..57b2f456a --- /dev/null +++ b/docs/assets/.DS_Store diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 93c4f5b32..13868fdd9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -231,14 +231,24 @@ div.topbar-wrapper div.topbar { div.popover-well { min-height: 160px; } + div.popover-well div.popover { display: block; } + div.popover-well div.popover-wrapper { width: 50%; height: 160px; float: left; + margin-left: 55px; + position:relative; } + div.popover-well div.popover-menu-wrapper { height: 80px; +} + +img.large-bird { + margin: 5px 0 0 310px; + opacity:.1; }
\ No newline at end of file diff --git a/docs/assets/img/bird.png b/docs/assets/img/bird.png Binary files differnew file mode 100644 index 000000000..f0e6fcb51 --- /dev/null +++ b/docs/assets/img/bird.png diff --git a/docs/index.html b/docs/index.html index 41be6b5ec..358642e2b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1114,55 +1114,30 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita </div> </div> </div> <!-- /row --> - + <div class="row"> <div class="span4 columns"> <h2>Popovers</h2> + <p>Use popovers to provide subtextual information to a page without effecting layout.</p> </div> <div class="span12 columns"> <div class="well popover-well"> - - <div class="popover-wrapper"> - <div class="popover above"> - <div class="popover-border"> - <h3 class="popover-title">Popover title</h3> - <div class="popover-inner"> - <p>Etiam porta sem malesuada magna mollis euismod. Maecenas faucibus mollis interdum. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p> - </div> - </div> - </div> - </div> - - <div class="popover-wrapper"> - <div class="popover bottom popover2"> + <div class="popover-wrapper"> + <div class="popover left"> <div class="arrow"></div> <div class="inner"> - <h3 class="title">Popover title</h3> + <h3 class="title">Popover Title</h3> <div class="content"> <p>Etiam porta sem malesuada magna mollis euismod. Maecenas faucibus mollis interdum. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p> </div> </div> </div> - </div> - - </div> - <div class="well popover-well popover-menu-well"> - <div class="popover-wrapper"> - <div class="popover popover-menu"> - <div class="popover-border"> - <div class="popover-inner"> - <a href="">View</a> - <a href="">Edit</a> - <a href="">Delete</a> - </div> - </div> - <div class="popover-arrow"></div> - </div> + <img class="large-bird" src="assets/img/bird.png"> </div> </div> </div> </div> <!-- /row --> - + </section> |
