mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts: docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css docs/examples/hero.html less/buttons.less less/carousel.less less/close.less less/dropdowns.less less/labels-badges.less less/mixins.less less/navbar.less less/navs.less less/pagination.less less/responsive-navbar.less less/scaffolding.less less/sprites.less less/thumbnails.less less/type.less
This commit is contained in:
commit
3db1b902c8
1 changed files with 1 additions and 1 deletions
|
@ -95,7 +95,7 @@
|
||||||
<div class="hero-unit">
|
<div class="hero-unit">
|
||||||
<h1>Hello, world!</h1>
|
<h1>Hello, world!</h1>
|
||||||
<p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
|
<p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
|
||||||
<p><a class="btn btn-primary btn-large">Learn more »</a></p>
|
<p><a href="#" class="btn btn-primary btn-large">Learn more »</a></p>
|
||||||
</div>
|
</div>
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span4">
|
<div class="span4">
|
||||||
|
|
Loading…
Add table
Reference in a new issue