aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-05 00:29:19 -0800
committerMark Otto <[email protected]>2012-02-05 00:29:19 -0800
commit6661639b37a6e577c4795e4394a0f0b6b75f4a01 (patch)
tree3218d856bfe80a70ffde05ebfd003e002e8951ce /docs
parent0336f1e644b2b2e76bf797aab6d26644c41de897 (diff)
downloadbootstrap-6661639b37a6e577c4795e4394a0f0b6b75f4a01.tar.xz
bootstrap-6661639b37a6e577c4795e4394a0f0b6b75f4a01.zip
#1693: manual fix of the pull request to add class name changes to pills/tabs to upgrade guide
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin52391 -> 52391 bytes
-rw-r--r--docs/templates/pages/upgrading.mustache2
-rw-r--r--docs/upgrading.html2
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2c140266b..0a56f52fd 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 23a53da0e..45ab0703b 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -111,7 +111,7 @@
</ul>
<h3>{{_i}}Navigation{{/i}}</h3>
<ul>
- <li>{{_i}}Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code>{{/i}}</li>
+ <li>{{_i}}Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code> and the class names are now <code>.nav-pills</code> and <code>.nav-tabs</code>.{{/i}}</li>
<li>{{_i}}New nav list variation added that uses the same base class, <code>.nav</code>{{/i}}</li>
<li>{{_i}}Vertical tabs and pills have been added&mdash;just add <code>.nav-stacked</code> to the <code>&lt;ul&gt;</code>{{/i}}</li>
<li>{{_i}}Pills were restyled to be less rounded by default{{/i}}</li>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 39da8e1f7..47cac06dc 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -187,7 +187,7 @@
</ul>
<h3>Navigation</h3>
<ul>
- <li>Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code></li>
+ <li>Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code> and the class names are now <code>.nav-pills</code> and <code>.nav-tabs</code>.</li>
<li>New nav list variation added that uses the same base class, <code>.nav</code></li>
<li>Vertical tabs and pills have been added&mdash;just add <code>.nav-stacked</code> to the <code>&lt;ul&gt;</code></li>
<li>Pills were restyled to be less rounded by default</li>