Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

8 files changed, 10 insertions, 10 deletions

diff --git a/docs/index.html b/docs/index.html
index 3e0cc0adc..24a0220f2 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -22,7 +22,7 @@ title: Bootstrap
         <a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
       </li>
       <li>
-        <a href="./docs/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
+        <a href="./getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
       </li>
       <li>
         <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
diff --git a/less/accordion.less b/less/accordion.less
index 064377d05..59765f154 100644
--- a/less/accordion.less
+++ b/less/accordion.less
@@ -5,7 +5,7 @@
 
 // Parent container
 .accordion {
-  margin-bottom: @line-height-base;
+  margin-bottom: @line-height-computed;
 }
 
 // Group == heading + body
diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less
index 87a6f0e37..2fe8217a3 100644
--- a/less/breadcrumbs.less
+++ b/less/breadcrumbs.less
@@ -5,7 +5,7 @@
 
 .breadcrumb {
   padding: 8px 15px;
-  margin: 0 0 @line-height-base;
+  margin: 0 0 @line-height-computed;
   list-style: none;
   background-color: #f5f5f5;
   border-radius: @border-radius-base;
diff --git a/less/code.less b/less/code.less
index d9ddbc3a4..f1bc0a0cd 100644
--- a/less/code.less
+++ b/less/code.less
@@ -25,8 +25,8 @@ code {
 // Blocks of code
 pre {
   display: block;
-  padding: ((@line-height-base - 1) / 2);
-  margin: 0 0 (@line-height-base / 2);
+  padding: ((@line-height-computed - 1) / 2);
+  margin: 0 0 (@line-height-computed / 2);
   font-size: (@font-size-base - 1); // 14px to 13px
   line-height: @line-height-base;
   word-break: break-all;
@@ -40,7 +40,7 @@ pre {
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint {
-    margin-bottom: @line-height-base;
+    margin-bottom: @line-height-computed;
   }
 
   // Account for some code outputs that place code tags in pre tags
diff --git a/less/mixins.less b/less/mixins.less
index 48e2073c5..dc46be904 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -340,7 +340,7 @@
 // Dividers (basically an hr) within dropdowns and nav lists
 .nav-divider(@top: #e5e5e5, @bottom: #fff) {
   height: 2px; // 1px for background, one for border
-  margin: ((@line-height-base / 2) - 1) 0;
+  margin: ((@line-height-computed / 2) - 1) 0;
   overflow: hidden;
   background-color: @top;
   border-bottom: 1px solid @bottom;
diff --git a/less/pager.less b/less/pager.less
index cc1947a91..0b2fcf7cb 100644
--- a/less/pager.less
+++ b/less/pager.less
@@ -4,7 +4,7 @@
 
 
 .pager {
-  margin: @line-height-base 0;
+  margin: @line-height-computed 0;
   list-style: none;
   text-align: center;
   .clearfix();
diff --git a/less/pagination.less b/less/pagination.less
index bb44fa8cf..ec1eef27f 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -3,7 +3,7 @@
 // --------------------------------------------------
 .pagination {
   display: inline-block;
-  margin: @line-height-base 0;
+  margin: @line-height-computed 0;
   border-radius: @border-radius-base;
 }
 .pagination > li {
diff --git a/less/tables.less b/less/tables.less
index 5c8fe82ad..fa5fd554b 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -17,7 +17,7 @@ th {
 
 .table {
   width: 100%;
-  margin-bottom: @line-height-base;
+  margin-bottom: @line-height-computed;
   // Cells
   thead > tr > th,
   tbody > tr > th,