From 8ecffcb32fc0d3a423f87fac9e613498b5104fe7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 28 Sep 2012 10:39:15 -0700 Subject: 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 ca03bb481..f13668877 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 e53c88abe..0406fd769 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>
-- 
cgit v1.2.3


From f8374a754d2ffe153ab14cb1315365c1303c6bbe Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 28 Sep 2012 15:01:12 -0700
Subject: 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 d3a92c831..ddd585205 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 289bbaaca..5aa7796d8 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.

-- cgit v1.2.3 From 57f8dbe25cd073bbf4d28a52cd82a2554ab024fc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 21:26:43 -0700 Subject: 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 ddd585205..1f0a039f0 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 572a25925..ad52d47c7 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 5aa7796d8..13192d90e 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 ddd296299..76fba9666 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}} +

-- cgit v1.2.3 From a2690c6d86e97655e87c77be59a0f252101b3a09 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 21:28:20 -0700 Subject: 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 000000000..a05d1ca4a --- /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 000000000..379bac708 --- /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 ad52d47c7..c3ac21de7 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 76fba9666..da2b1211d 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}}
    • -- cgit v1.2.3 From a4a6244eb7a7514ad7410403bf5b60d1bf3e88b0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 22:09:51 -0700 Subject: add sticky footer example per martin bean's suggestion, using the implementation by ryan fait --- .../examples/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 000000000..c5a1f5f01 Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-sticky-footer.png differ diff --git a/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html new file mode 100644 index 000000000..50fab606b --- /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 7a6d05e42..814bb67f2 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 0eecd6247..e96ec292c 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}}

    +
    • + + -- cgit v1.2.3 From d49dd766c87ce97dc45f37f3198841ca4e02d9e6 Mon Sep 17 00:00:00 2001 From: amid2887 Date: Mon, 1 Oct 2012 12:27:37 +0700 Subject: 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 3fd1e95f5..ada76ea22 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; } -- cgit v1.2.3 From da43c7c27cb08a76775ad64b5caa210630d0c2cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 22:41:26 -0700 Subject: 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 825d6b51e..0160bf1f6 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; } -- cgit v1.2.3