diff options
| author | Jacob Thornton <[email protected]> | 2011-09-02 21:04:25 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-02 21:04:25 -0700 |
| commit | 0e13f8dca10ff19397d577b0916a72129183bfeb (patch) | |
| tree | 94840c00948c1b9844be7db18b8c1623100639bd /examples | |
| parent | b4a84e1e7de1e5448cf9adc61a1a02badec80439 (diff) | |
| parent | 2589c0ac4ecc86feed81cfc5df344e0eb78cda64 (diff) | |
| download | bootstrap-0e13f8dca10ff19397d577b0916a72129183bfeb.tar.xz bootstrap-0e13f8dca10ff19397d577b0916a72129183bfeb.zip | |
Merge branch 'master' of github.com:twitter/bootstrap into js-examples
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
lib/scaffolding.less
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/hero.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/hero.html b/examples/hero.html index a0025f2de..ef773c5d0 100644 --- a/examples/hero.html +++ b/examples/hero.html @@ -12,7 +12,7 @@ <![endif]--> <!-- Le styles --> - <link href="../bootstrap-1.1.1.css" rel="stylesheet"> + <link href="../bootstrap-1.2.0.css" rel="stylesheet"> <!-- Le fav and touch icons --> <link rel="shortcut icon" href="images/favicon.ico"> @@ -27,7 +27,7 @@ <div class="fill"> <div class="container"> <h3><a href="#">Project name</a></h3> - <ul> + <ul class="nav"> <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> |