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

8 files changed, 10 insertions, 12 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e721aaa80..1ec4304d6 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3298,6 +3298,7 @@ button.close {
 
 .pagination {
   display: inline-block;
+  padding-left: 0;
   margin: 20px 0;
   border-radius: 4px;
 }
@@ -3389,6 +3390,7 @@ button.close {
 }
 
 .pager {
+  padding-left: 0;
   margin: 20px 0;
   text-align: center;
   list-style: none;
@@ -4014,7 +4016,7 @@ a.thumbnail:focus {
 }
 
 .media-list {
-  margin-left: 0;
+  padding-left: 0;
   list-style: none;
 }
 
diff --git a/docs/examples/navbar-fixed-top.html b/docs/examples/navbar-fixed-top.html
index 2f73f08e4..425ff418f 100644
--- a/docs/examples/navbar-fixed-top.html
+++ b/docs/examples/navbar-fixed-top.html
@@ -60,7 +60,7 @@ title: Fixed navbar template
         <h1>Navbar example</h1>
         <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
         <p>
-          <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
+          <a class="btn btn-large btn-primary" href="/components/#navbar">View navbar docs &raquo;</a>
         </p>
       </div>
 
diff --git a/docs/examples/navbar-static-top.html b/docs/examples/navbar-static-top.html
index f22746900..c32d2134a 100644
--- a/docs/examples/navbar-static-top.html
+++ b/docs/examples/navbar-static-top.html
@@ -57,7 +57,7 @@ title: Static navbar template
     <h1>Navbar example</h1>
     <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
     <p>
-      <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
+      <a class="btn btn-large btn-primary" href="/components/#navbar">View navbar docs &raquo;</a>
     </p>
   </div>
 
diff --git a/docs/examples/navbar.html b/docs/examples/navbar.html
index f8b25482e..09dba0f23 100644
--- a/docs/examples/navbar.html
+++ b/docs/examples/navbar.html
@@ -60,7 +60,7 @@ title: Navbar template
     <h1>Navbar example</h1>
     <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
     <p>
-      <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
+      <a class="btn btn-large btn-primary" href="/components/#navbar">View navbar docs &raquo;</a>
     </p>
   </div>
 
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 718e8ed79..56e6cbc32 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -15,7 +15,7 @@ lead: "An overview of Bootstrap, how to download and use, basic templates and ex
     <p class="lead">There are a few easy ways to quickly get started with Bootstrap, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.</p>
 
     <h3>Download compiled CSS and JS</h3>
-    <p class="lead">The fastest way to get started is to get the compiled and minified versions of our CSS, JavaScript, and fonts. No documentation or original source files are included.</p>
+    <p class="lead">The fastest way to get started is to get the compiled and minified versions of our CSS and JavaScript. No documentation or original source files are included.</p>
     <p><a class="btn btn-large btn-primary" href="assets/bootstrap.zip" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p>
 
     <hr>
@@ -72,12 +72,6 @@ bootstrap/
 ├── js/
 │   ├── bootstrap.js
 │   ├── bootstrap.min.js
-└── fonts/
-    ├── glyphiconshalflings-regular.eot
-    ├── glyphiconshalflings-regular.otf
-    ├── glyphiconshalflings-regular.svg
-    ├── glyphiconshalflings-regular.ttf
-    └── glyphiconshalflings-regular.woff
 {% endhighlight %}
 
     <p>This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). The image files are compressed using <a href="http://imageoptim.com/">ImageOptim</a>, a Mac app for compressing PNGs.</p>
diff --git a/less/media.less b/less/media.less
index 21063eb2b..bcba8081c 100644
--- a/less/media.less
+++ b/less/media.less
@@ -49,6 +49,6 @@
 
 // Undo default ul/ol styles
 .media-list {
-  margin-left: 0;
+  padding-left: 0;
   list-style: none;
 }
diff --git a/less/pager.less b/less/pager.less
index 0b2fcf7cb..007952da0 100644
--- a/less/pager.less
+++ b/less/pager.less
@@ -4,6 +4,7 @@
 
 
 .pager {
+  padding-left: 0;
   margin: @line-height-computed 0;
   list-style: none;
   text-align: center;
diff --git a/less/pagination.less b/less/pagination.less
index 73c063be0..320387a67 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -3,6 +3,7 @@
 // --------------------------------------------------
 .pagination {
   display: inline-block;
+  padding-left: 0;
   margin: @line-height-computed 0;
   border-radius: @border-radius-base;
 }