diff options
| author | Jacob Thornton <[email protected]> | 2011-08-21 20:42:54 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-08-21 20:42:54 -0700 |
| commit | 2f6f9ec6e05348ab68859ebf043a0d22d8956efc (patch) | |
| tree | 7929bb46b5725c4b3476f34dd48ff230098db3d7 /docs | |
| parent | 0e92acd9fffd144445c403f8d725de51adf6bf2e (diff) | |
| parent | 34a19915f4f8b53eb7a5f2ffa4c87f7d47853827 (diff) | |
| download | bootstrap-2f6f9ec6e05348ab68859ebf043a0d22d8956efc.tar.xz bootstrap-2f6f9ec6e05348ab68859ebf043a0d22d8956efc.zip | |
Merge branch 'misc_css_fixes' of github.com:twitter/bootstrap into misc_css_fixes
Conflicts:
lib/forms.less
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.html | 80 |
1 files changed, 36 insertions, 44 deletions
diff --git a/docs/index.html b/docs/index.html index 686115684..eec45ec71 100644 --- a/docs/index.html +++ b/docs/index.html @@ -361,64 +361,54 @@ <div class="span4 columns"> <h4>Unordered <code><ul></code></h4> <ul> - <li>Jeremy Bixby</li> - <li>Robert Dezure</li> - <li>Josh Washington</li> - <li>Anton Capresi</li> - <li>My Team Mates + <li>Lorem ipsum dolor sit amet</li> + <li>Consectetur adipiscing elit</li> + <li>Integer molestie lorem at massa</li> + <li>Facilisis in pretium nisl aliquet</li> + <li>Nulla volutpat aliquam velit <ul> - <li>George Castanza</li> - <li>Jerry Seinfeld</li> - <li>Cosmo Kramer</li> - <li>Elaine Bennis</li> - <li>Newman</li> + <li>Phasellus iaculis neque</li> + <li>Purus sodales ultricies</li> + <li>Vestibulum laoreet porttitor sem</li> + <li>Ac tristique libero volutpat at</li> </ul> </li> - <li>John Jacob</li> - <li>Paul Pierce</li> - <li>Kevin Garnett</li> + <li>Faucibus porta lacus fringilla vel</li> + <li>Aenean sit amet erat nunc</li> + <li>Eget porttitor lorem</li> </ul> </div> <div class="span4 columns"> <h4>Unstyled <code><ul.unstyled></code></h4> <ul class="unstyled"> - <li>Jeremy Bixby</li> - <li>Robert Dezure</li> - <li>Josh Washington</li> - <li>Anton Capresi</li> - <li>My Team Mates + <li>Lorem ipsum dolor sit amet</li> + <li>Consectetur adipiscing elit</li> + <li>Integer molestie lorem at massa</li> + <li>Facilisis in pretium nisl aliquet</li> + <li>Nulla volutpat aliquam velit <ul> - <li>George Castanza</li> - <li>Jerry Seinfeld</li> - <li>Cosmo Kramer</li> - <li>Elaine Bennis</li> - <li>Newman</li> + <li>Phasellus iaculis neque</li> + <li>Purus sodales ultricies</li> + <li>Vestibulum laoreet porttitor sem</li> + <li>Ac tristique libero volutpat at</li> </ul> </li> - <li>John Jacob</li> - <li>Paul Pierce</li> - <li>Kevin Garnett</li> + <li>Faucibus porta lacus fringilla vel</li> + <li>Aenean sit amet erat nunc</li> + <li>Eget porttitor lorem</li> </ul> </div> <div class="span4 columns"> <h4>Ordered <code><ol></code></h4> <ol> - <li>Jeremy Bixby</li> - <li>Robert Dezure</li> - <li>Josh Washington</li> - <li>Anton Capresi</li> - <li>My Team Mates - <ol> - <li>George Castanza</li> - <li>Jerry Seinfeld</li> - <li>Cosmo Kramer</li> - <li>Elaine Bennis</li> - <li>Newman</li> - </ol> - </li> - <li>John Jacob</li> - <li>Paul Pierce</li> - <li>Kevin Garnett</li> + <li>Lorem ipsum dolor sit amet</li> + <li>Consectetur adipiscing elit</li> + <li>Integer molestie lorem at massa</li> + <li>Facilisis in pretium nisl aliquet</li> + <li>Nulla volutpat aliquam velit</li> + <li>Faucibus porta lacus fringilla vel</li> + <li>Aenean sit amet erat nunc</li> + <li>Eget porttitor lorem</li> </ol> </div> <div class="span4 columns"> @@ -1176,13 +1166,15 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita </div> </div> </div> +<<<<<<< HEAD + <img class="large-bird" src="assets/img/bird.png" width="220px" height="145px"> +======= <img class="large-bird" src="assets/img/bird.png" width="220px" height="151px"> +>>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1 </div> </div> </div> </div> <!-- /row --> - - </section> |