diff options
| author | Jacob Thornton <[email protected]> | 2011-10-29 17:08:35 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-10-29 17:08:35 -0700 |
| commit | 9a30b8c05d26aa6c8e80c0b81f2fb3d979157a24 (patch) | |
| tree | b089f69bb5c31d47f9408f11935645a67e4cbd68 /examples | |
| parent | 61937a803b96748377dd49d50439d96d68a9e40c (diff) | |
| parent | d3b8a96589ab6dd70fad89413e04c09008c7c133 (diff) | |
| download | bootstrap-9a30b8c05d26aa6c8e80c0b81f2fb3d979157a24.tar.xz bootstrap-9a30b8c05d26aa6c8e80c0b81f2fb3d979157a24.zip | |
Merge branch 'master' of github.com:twitter/bootstrap into dev
Conflicts:
bootstrap.css
bootstrap.min.css
lib/forms.less
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/hero.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/hero.html b/examples/hero.html index 6ded6e1e9..49131d294 100644 --- a/examples/hero.html +++ b/examples/hero.html @@ -52,17 +52,17 @@ <!-- Example row of columns --> <div class="row"> - <div class="span6"> + <div class="span-one-third"> <h2>Heading</h2> <p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p> <p><a class="btn" href="#">View details »</a></p> </div> - <div class="span5"> + <div class="span-one-third"> <h2>Heading</h2> <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p> <p><a class="btn" href="#">View details »</a></p> </div> - <div class="span5"> + <div class="span-one-third"> <h2>Heading</h2> <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p> <p><a class="btn" href="#">View details »</a></p> |