diff options
| author | Mark Otto <[email protected]> | 2013-02-05 19:39:49 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-05 19:39:49 -0800 |
| commit | 0a8d834af61725a61ca7fbc917dd4ae1d36f0769 (patch) | |
| tree | ac34c3545a6d1ef2af5897e5d6c5df093293224a | |
| parent | cc58a65fa125f119af713db5d92413c093503ce4 (diff) | |
| parent | 034155ec215f3c6dadbc22939737de5184128756 (diff) | |
| download | bootstrap-0a8d834af61725a61ca7fbc917dd4ae1d36f0769.tar.xz bootstrap-0a8d834af61725a61ca7fbc917dd4ae1d36f0769.zip | |
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
| -rw-r--r-- | fluid.html | 2 | ||||
| -rw-r--r-- | hero.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fluid.html b/fluid.html index faf811b3a..502062a27 100644 --- a/fluid.html +++ b/fluid.html @@ -95,7 +95,7 @@ <div class="hero-unit"> <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><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 class="row-fluid"> <div class="span4"> @@ -75,7 +75,7 @@ <div class="hero-unit"> <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><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> <!-- Example row of columns --> |