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 | 15c7e73abd8d97f0139d177d05c94e26faa17dd2 (patch) | |
| tree | 5d9a2317d17b669fe4a9ce6863ea59f0ddeea430 /docs/examples | |
| parent | cb0fed66933d179b5bc3669a1df7df00b5688cbe (diff) | |
| parent | c55329085ebc6d05d91412251331c0613ea2250b (diff) | |
| download | bootstrap-15c7e73abd8d97f0139d177d05c94e26faa17dd2.tar.xz bootstrap-15c7e73abd8d97f0139d177d05c94e26faa17dd2.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
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/fluid.html | 2 | ||||
| -rw-r--r-- | docs/examples/hero.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index faf811b3a..502062a27 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/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"> diff --git a/docs/examples/hero.html b/docs/examples/hero.html index ef7b222e1..6fb7a2c4e 100644 --- a/docs/examples/hero.html +++ b/docs/examples/hero.html @@ -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 --> |