From 4252dff850e72269ea74aa86d63a880247ff22b3 Mon Sep 17 00:00:00 2001 From: John O'Nolan Date: Sat, 29 Jun 2013 13:21:16 +0200 Subject: [PATCH 1/3] Fixes broken links to navbar component in docs. --- docs/examples/navbar-fixed-top.html | 2 +- docs/examples/navbar-static-top.html | 2 +- docs/examples/navbar.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/examples/navbar-fixed-top.html b/docs/examples/navbar-fixed-top.html index 2f73f08e..425ff418 100644 --- a/docs/examples/navbar-fixed-top.html +++ b/docs/examples/navbar-fixed-top.html @@ -60,7 +60,7 @@ title: Fixed navbar template

Navbar example

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.

- View navbar docs » + View navbar docs »

diff --git a/docs/examples/navbar-static-top.html b/docs/examples/navbar-static-top.html index f2274690..c32d2134 100644 --- a/docs/examples/navbar-static-top.html +++ b/docs/examples/navbar-static-top.html @@ -57,7 +57,7 @@ title: Static navbar template

Navbar example

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.

- View navbar docs » + View navbar docs »

diff --git a/docs/examples/navbar.html b/docs/examples/navbar.html index f8b25482..09dba0f2 100644 --- a/docs/examples/navbar.html +++ b/docs/examples/navbar.html @@ -60,7 +60,7 @@ title: Navbar template

Navbar example

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.

- View navbar docs » + View navbar docs »

From 02351c0589be66edcc2dc10bd059aeac55eb6163 Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Sat, 29 Jun 2013 07:37:53 -0700 Subject: [PATCH 2/3] Remove references to fonts --- docs/getting-started.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/getting-started.html b/docs/getting-started.html index 718e8ed7..56e6cbc3 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

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.

Download compiled CSS and JS

-

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.

+

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.

Download Bootstrap

@@ -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 %}

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 (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). The image files are compressed using ImageOptim, a Mac app for compressing PNGs.

From 6a20810ca4970a681bd34274851365af011694e3 Mon Sep 17 00:00:00 2001 From: Francis Brunelle Date: Sat, 29 Jun 2013 16:06:14 -0400 Subject: [PATCH 3/3] reset left padding for .media-list, .pagination and .pager --- docs/assets/css/bootstrap.css | 4 +++- less/media.less | 2 +- less/pager.less | 1 + less/pagination.less | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c76723b9..28f561a3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3303,6 +3303,7 @@ button.close { .pagination { display: inline-block; + padding-left: 0; margin: 20px 0; border-radius: 4px; } @@ -3394,6 +3395,7 @@ button.close { } .pager { + padding-left: 0; margin: 20px 0; text-align: center; list-style: none; @@ -4019,7 +4021,7 @@ a.thumbnail:focus { } .media-list { - margin-left: 0; + padding-left: 0; list-style: none; } diff --git a/less/media.less b/less/media.less index 21063eb2..bcba8081 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 0b2fcf7c..007952da 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 73c063be..320387a6 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; }