From 8ecffcb32fc0d3a423f87fac9e613498b5104fe7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 28 Sep 2012 10:39:15 -0700 Subject: [PATCH 1/7] fixes #5334: html snippet comments --- docs/javascript.html | 4 ++-- docs/templates/pages/javascript.mustache | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/javascript.html b/docs/javascript.html index ca03bb4816..f136688772 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -249,10 +249,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/javascript.mustache b/docs/templates/pages/javascript.mustache
index e53c88abe1..0406fd769c 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>

From f8374a754d2ffe153ab14cb1315365c1303c6bbe Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 28 Sep 2012 15:01:12 -0700
Subject: [PATCH 2/7] clean up emphasis docs text

---
 docs/base-css.html                     | 4 ++--
 docs/templates/pages/base-css.mustache | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index d3a92c8312..ddd585205b 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -155,14 +155,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.

           

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 289bbaaca0..5aa7796d80 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.

From 57f8dbe25cd073bbf4d28a52cd82a2554ab024fc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 21:26:43 -0700 Subject: [PATCH 3/7] fixes #5360: typo in tables docs --- docs/base-css.html | 2 +- docs/index.html | 16 ++++++++++++---- docs/templates/pages/base-css.mustache | 2 +- docs/templates/pages/index.mustache | 16 ++++++++++++---- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index ddd585205b..1f0a039f07 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -509,7 +509,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 IE7-IE8).

diff --git a/docs/index.html b/docs/index.html index 572a25925f..ad52d47c7d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -73,11 +73,19 @@

Bootstrap

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

-

Download Bootstrap

+

+ Download Bootstrap +

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 5aa7796d80..13192d90e1 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -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 IE7-IE8).{{/i}}

diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index ddd296299c..76fba96666 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -2,11 +2,19 @@

{{_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}} +

From a2690c6d86e97655e87c77be59a0f252101b3a09 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 21:28:20 -0700 Subject: [PATCH 4/7] add link to examples on index page; add back narrow marketing page and signin page examples --- docs/examples/marketing-narrow.html | 137 ++++++++++++++++++++++++++++ docs/examples/signin.html | 94 +++++++++++++++++++ docs/index.html | 3 + docs/templates/pages/index.mustache | 3 + 4 files changed, 237 insertions(+) create mode 100644 docs/examples/marketing-narrow.html create mode 100644 docs/examples/signin.html 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/index.html b/docs/index.html index ad52d47c7d..c3ac21de77 100644 --- a/docs/index.html +++ b/docs/index.html @@ -80,6 +80,9 @@
  • GitHub project
    • +
  • + Examples +
  • Extend
    • diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 76fba96666..da2b1211dd 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -9,6 +9,9 @@
  • {{_i}}GitHub project{{/i}}
    • +
  • + {{_i}}Examples{{/i}} +
  • {{_i}}Extend{{/i}}
    • From a4a6244eb7a7514ad7410403bf5b60d1bf3e88b0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 22:09:51 -0700 Subject: [PATCH 5/7] add sticky footer example per martin bean's suggestion, using the implementation by ryan fait --- .../bootstrap-example-sticky-footer.png | Bin 0 -> 11905 bytes docs/examples/sticky-footer.html | 124 ++++++++++++++++++ docs/getting-started.html | 11 +- docs/templates/pages/getting-started.mustache | 11 +- 4 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 docs/assets/img/examples/bootstrap-example-sticky-footer.png create mode 100644 docs/examples/sticky-footer.html 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 0000000000000000000000000000000000000000..c5a1f5f0154c1efc4f818f3ec15a73fdaae54137 GIT binary patch literal 11905 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 + + + + 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 7a6d05e420..814bb67f25 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -277,6 +277,15 @@

    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/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index 0eecd6247d..e96ec292cf 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -206,6 +206,15 @@

    {{_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}}

    +
    • + + From d49dd766c87ce97dc45f37f3198841ca4e02d9e6 Mon Sep 17 00:00:00 2001 From: amid2887 Date: Mon, 1 Oct 2012 12:27:37 +0700 Subject: [PATCH 6/7] Add missing icon class definition for buttons.less add missing icon class definition for buttons: '[class*=" icon-"]' --- less/buttons.less | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/less/buttons.less b/less/buttons.less index 3fd1e95f5f..ada76ea223 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -78,7 +78,8 @@ line-height: normal; .border-radius(5px); } -.btn-large [class^="icon-"] { +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { margin-top: 2px; } @@ -88,7 +89,8 @@ font-size: @baseFontSize - 2px; line-height: @baseLineHeight - 2px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { margin-top: 0; } From da43c7c27cb08a76775ad64b5caa210630d0c2cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 22:41:26 -0700 Subject: [PATCH 7/7] run make after merge --- docs/assets/css/bootstrap.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 825d6b51e7..0160bf1f63 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3189,7 +3189,8 @@ button.close { border-radius: 5px; } -.btn-large [class^="icon-"] { +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { margin-top: 2px; } @@ -3201,7 +3202,8 @@ button.close { border-radius: 3px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { margin-top: 0; }