diff options
| author | Jacob Thornton <jacobthornton@gmail.com> | 2012-02-01 01:59:08 +0400 |
|---|---|---|
| committer | Jacob Thornton <jacobthornton@gmail.com> | 2012-02-01 01:59:08 +0400 |
| commit | e75bc5eb5ffca534fd3a84d749e8b39824654ebb (patch) | |
| tree | 489c4b5428bb074b96f9b4fbc28abd1f6164ff1c | |
| parent | 390a9af936ce6350bec2660b579e3dcab5918fdb (diff) | |
| parent | aec0cb3303eaa6952e08227bed505f8b6527caad (diff) | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/bootstrap.zip
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 52330 -> 52330 bytes | |||
| -rw-r--r-- | docs/less.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/less.mustache | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 9fa9c1f605..3058e4ff88 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/less.html b/docs/less.html index 09d269ef1f..05aee06bc9 100644 --- a/docs/less.html +++ b/docs/less.html @@ -84,7 +84,7 @@ <h1>Using LESS with Bootstrap</h1> <p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p> <div class="subnav"> - <ul class="nav pills"> + <ul class="nav nav-pills"> <li><a href="#builtWith">Built with Less</a></li> <li><a href="#variables">Variables</a></li> <li><a href="#mixins">Mixins</a></li> diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index eb262c78b9..52ea659bb0 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -8,7 +8,7 @@ <h1>{{_i}}Using LESS with Bootstrap{{/i}}</h1> <p class="lead">{{_i}}Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}</p> <div class="subnav"> - <ul class="nav pills"> + <ul class="nav nav-pills"> <li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li> <li><a href="#variables">{{_i}}Variables{{/i}}</a></li> <li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li> |