diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0ab9a33b4a..bcaa06ed26 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3058,7 +3058,8 @@ button.close { border-radius: 5px; } -.btn-large [class^="icon-"] { +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { margin-top: 2px; } @@ -3070,7 +3071,8 @@ button.close { border-radius: 3px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { margin-top: 0; } diff --git a/docs/assets/img/examples/bootstrap-example-sticky-footer.png b/docs/assets/img/examples/bootstrap-example-sticky-footer.png new file mode 100644 index 0000000000..c5a1f5f015 Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-sticky-footer.png differ diff --git a/docs/base-css.html b/docs/base-css.html index 1cf7002363..8d0261e5c6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -153,14 +153,14 @@

Bold

-

For emphasizing a snippet of text with important

+

For emphasizing a snippet of text with a heavier font-weight.

The following snippet of text is rendered as bold text.

<strong>rendered as bold text</strong>

Italics

-

For emphasizing a snippet of text with stress

+

For emphasizing a snippet of text with italics.

The following snippet of text is rendered as italicized text.

@@ -507,7 +507,7 @@ For example, <code><section></code> should be wrapped as inlin

Optional classes

-

Add any of the follow classes to the .table base class.

+

Add any of the following classes to the .table base class.

.table-striped

Adds zebra-striping to any table row within the <tbody> via the :nth-child CSS selector (not available in IE8).

diff --git a/docs/examples/marketing-narrow.html b/docs/examples/marketing-narrow.html new file mode 100644 index 0000000000..a05d1ca4a3 --- /dev/null +++ b/docs/examples/marketing-narrow.html @@ -0,0 +1,137 @@ + + + + + Template · Bootstrap + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

Project name

+
+ +
+ +
+

Super awesome marketing speak!

+

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

+ Sign up today +
+ +
+ +
+
+

Subheading

+

Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.

+ +

Subheading

+

Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.

+ +

Subheading

+

Maecenas sed diam eget risus varius blandit sit amet non magna.

+
+ +
+

Subheading

+

Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.

+ +

Subheading

+

Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.

+ +

Subheading

+

Maecenas sed diam eget risus varius blandit sit amet non magna.

+
+
+ +
+ +
+

© Company 2012

+
+ +
+ + + + + + + + + + + + + + + + + + + diff --git a/docs/examples/signin.html b/docs/examples/signin.html new file mode 100644 index 0000000000..379bac7081 --- /dev/null +++ b/docs/examples/signin.html @@ -0,0 +1,94 @@ + + + + + Sign in · Twitter Bootstrap + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + diff --git a/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html new file mode 100644 index 0000000000..50fab606b1 --- /dev/null +++ b/docs/examples/sticky-footer.html @@ -0,0 +1,124 @@ + + + + + Sticky footer · Twitter Bootstrap + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+

Sticky footer

+
+

Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/getting-started.html b/docs/getting-started.html index 0c13789955..c37c037bd6 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -239,21 +239,21 @@

Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.

-
+

Basic marketing site

Featuring a hero unit for a primary message and three supporting elements.

-
+

Fluid layout

Uses our new responsive, fluid grid system to create a seamless liquid layout.

-
+
@@ -261,28 +261,39 @@

A barebones HTML document with all the Bootstrap CSS and JavaScript included.

-
+

Narrow marketing

Slim, lightweight marketing template for small projects or teams.

-
+

Sign in

Barebones sign in form with custom, larger form controls and a flexible layout.

-
+
+ + + +

Sticky footer

+

Pin a fixed-height footer to the bottom of the user's viewport.

+
+ +
+ diff --git a/docs/index.html b/docs/index.html index 64cfbae1f9..bba88b3be5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -71,11 +71,22 @@

Bootstrap

Sleek, intuitive, and powerful front-end framework for faster and easier web development.

-

Download Bootstrap

+

+ Download Bootstrap +

diff --git a/docs/javascript.html b/docs/javascript.html index 75901bc068..03d6701328 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -247,10 +247,10 @@ $('#myModal').on('show', function (e) { Launch demo modal 
-<-- Button to trigger modal -->
+<!-- Button to trigger modal -->
 <a href="#myModal" role="button" class="btn" data-toggle="modal">Launch demo modal</a>
 
-<-- Modal -->
+<!-- Modal -->
 <div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index e41aa408ef..1a91ff3879 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -89,14 +89,14 @@

{{_i}}Bold{{/i}}

-

{{_i}}For emphasizing a snippet of text with important{{/i}}

+

{{_i}}For emphasizing a snippet of text with a heavier font-weight.{{/i}}

The following snippet of text is rendered as bold text.

<strong>rendered as bold text</strong>

{{_i}}Italics{{/i}}

-

{{_i}}For emphasizing a snippet of text with stress{{/i}}

+

{{_i}}For emphasizing a snippet of text with italics.{{/i}}

The following snippet of text is rendered as italicized text.

@@ -446,7 +446,7 @@

{{_i}}Optional classes{{/i}}

-

{{_i}}Add any of the follow classes to the .table base class.{{/i}}

+

{{_i}}Add any of the following classes to the .table base class.{{/i}}

{{_i}}.table-striped{{/i}}

{{_i}}Adds zebra-striping to any table row within the <tbody> via the :nth-child CSS selector (not available in IE8).{{/i}}

diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index bfc2e8a3ad..5086c56321 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -170,21 +170,21 @@

{{_i}}Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.{{/i}}

-
+

{{_i}}Basic marketing site{{/i}}

{{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}

-
+

{{_i}}Fluid layout{{/i}}

{{_i}}Uses our new responsive, fluid grid system to create a seamless liquid layout.{{/i}}

-
+
@@ -192,28 +192,39 @@

{{_i}}A barebones HTML document with all the Bootstrap CSS and JavaScript included.{{/i}}

-
+

{{_i}}Narrow marketing{{/i}}

{{_i}}Slim, lightweight marketing template for small projects or teams.{{/i}}

-
+

{{_i}}Sign in{{/i}}

{{_i}}Barebones sign in form with custom, larger form controls and a flexible layout.{{/i}}

-
+
+ + + +

{{_i}}Sticky footer{{/i}}

+

{{_i}}Pin a fixed-height footer to the bottom of the user's viewport.{{/i}}

+
+ +
+ diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 43e9ff410c..0b4e8e3f1b 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -2,11 +2,22 @@

{{_i}}Bootstrap{{/i}}

{{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}

-

{{_i}}Download Bootstrap{{/i}}

+

+ {{_i}}Download Bootstrap{{/i}} +

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 1afb408725..6b7821f101 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -179,10 +179,10 @@ $('#myModal').on('show', function (e) { {{_i}}Launch demo modal{{/i}}
{{! /example }} 
-<-- Button to trigger modal -->
+<!-- Button to trigger modal -->
 <a href="#myModal" role="button" class="btn" data-toggle="modal">{{_i}}Launch demo modal{{/i}}</a>
 
-<-- Modal -->
+<!-- Modal -->
 <div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
diff --git a/less/buttons.less b/less/buttons.less
index 33441ac701..25bfb9ae9f 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -72,7 +72,8 @@
   font-size: @fontSizeLarge;
   .border-radius(@borderRadiusLarge);
 }
-.btn-large [class^="icon-"] {
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
   margin-top: 2px;
 }
 
@@ -82,7 +83,8 @@
   font-size: @fontSizeSmall;
   .border-radius(@borderRadiusSmall);
 }
-.btn-small [class^="icon-"] {
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
   margin-top: 0;
 }