From fc42ac6a56a5ce4ad58ff3d817a369cd57345d1b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Nov 2012 09:47:42 -0700 Subject: [PATCH 1/7] fixes #5756: duplicate media CSS in compiled builds --- docs/customize.html | 1 - docs/templates/pages/customize.mustache | 1 - 2 files changed, 2 deletions(-) diff --git a/docs/customize.html b/docs/customize.html index 5cf80c4648..4fa47d7bb1 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -144,7 +144,6 @@

Miscellaneous

- diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 386f6930a3..6674da87bc 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -73,7 +73,6 @@

{{_i}}Miscellaneous{{/i}}

- From 46b5e0cbc6cc82cfcfef45c0eb69a0daac8ceb3c Mon Sep 17 00:00:00 2001 From: Bradly Feeley Date: Fri, 2 Nov 2012 16:34:21 -0600 Subject: [PATCH 2/7] Fixing various spelling typos in the docs. --- docs/assets/js/README.md | 2 +- docs/base-css.html | 2 +- docs/javascript.html | 6 +++--- docs/templates/pages/base-css.mustache | 2 +- docs/templates/pages/javascript.mustache | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/assets/js/README.md b/docs/assets/js/README.md index b58fa1d407..66903c71a6 100644 --- a/docs/assets/js/README.md +++ b/docs/assets/js/README.md @@ -17,7 +17,7 @@ To target a specific plugin, just include the plugins name as a namespace along --- -### PROGRAMATIC API +### PROGRAMMATIC API We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API. diff --git a/docs/base-css.html b/docs/base-css.html index 4d27a6d69d..26dc298c61 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -192,7 +192,7 @@

Abbreviations

-

Stylized implemenation of HTML's <abbr> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.

+

Stylized implementation of HTML's <abbr> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.

<abbr>

For expanded text on long hover of an abbreviation, include the title attribute.

diff --git a/docs/javascript.html b/docs/javascript.html index 2a38362891..4418e89be9 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -136,7 +136,7 @@ $("#myModal").modal('show') // initializes and invokes show immed

Events

Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. show) is triggered at the start of an event, and its past participle form (ex. shown) is trigger on the completion of an action.

-

All infinitive events provide preventDefault functionality. This provides the abililty to stop the execution of an action before it starts.

+

All infinitive events provide preventDefault functionality. This provides the ability to stop the execution of an action before it starts.

 $('#myModal').on('show', function (e) {
     if (!data) return e.preventDefault() // stops modal from being shown
@@ -507,7 +507,7 @@ $('#myModal').on('hidden', function () {
 
           
Methods

           
$().dropdown('toggle')

-          
A programatic api for toggling menus for a given navbar or tabbed navigation.

+          
A programmatic api for toggling menus for a given navbar or tabbed navigation.

         
 
 
@@ -636,7 +636,7 @@ $('[data-spy="scroll"]').each(function () {
 
 
           
Example tabs

-          
Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.

+          
Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.

           

             

 
@@ -175,7 +175,7 @@
 
 <address>
   <strong>{{_i}}Full Name{{/i}}</strong><br>
-  <a href="mailto:#">{{_i}}first.last@gmail.com{{/i}}</a>
+  <a href="mailto:#">{{_i}}first.last@example.com{{/i}}</a>
 </address>
 

 

From ead5dbeba5cd7acfa560bfb353f5e7c4f4a19256 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 3 Nov 2012 13:18:23 -0700
Subject: [PATCH 4/7] Fixes #5775: Collapse labels/badges

* When :empty, display: none;
* Add documentation for change in behavior
---
 docs/assets/css/bootstrap.css            | 5 +++++
 docs/components.html                     | 3 +++
 docs/templates/pages/components.mustache | 3 +++
 less/labels-badges.less                  | 8 ++++++++
 4 files changed, 19 insertions(+)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 142df455aa..83c9bec75a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5427,6 +5427,11 @@ a.thumbnail:hover {
           border-radius: 9px;
 }
 
+.label:empty,
+.badge:empty {
+  display: none;
+}
+
 a.label:hover,
 a.badge:hover {
   color: #ffffff;
diff --git a/docs/components.html b/docs/components.html
index 1874470f46..a99a96b9b1 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1859,6 +1859,9 @@
             
           
 
+          
Easily collapsible

+          
For easy implementation, labels and badges will simply collapse (via CSS's :empty selector) when no content exists within.

+
         
 
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 3c024451c2..0a655d6de2 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1788,6 +1788,9 @@
             
           
 
+          
{{_i}}Easily collapsible{{/i}}

+          
{{_i}}For easy implementation, labels and badges will simply collapse (via CSS's :empty selector) when no content exists within.{{/i}}

+
         
 
 
diff --git a/less/labels-badges.less b/less/labels-badges.less
index d118a0190e..9c3a40bfbf 100644
--- a/less/labels-badges.less
+++ b/less/labels-badges.less
@@ -27,6 +27,14 @@
   .border-radius(9px);
 }
 
+// Empty labels/badges collapse
+.label,
+.badge {
+  &:empty {
+    display: none;
+  }
+}
+
 // Hover state, but only for links
 a {
   &.label:hover,

From c9dbd2d60147b1a2f05fe08c72a0a28a90c73dc7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 3 Nov 2012 13:28:48 -0700
Subject: [PATCH 5/7] Fixes #5458: Clarify fluid nesting

---
 docs/assets/css/docs.css                  |  6 ++++++
 docs/scaffolding.html                     | 18 ++++++++++++++++--
 docs/templates/pages/scaffolding.mustache | 18 ++++++++++++++++--
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 60782ecea4..c08d529aa1 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -335,8 +335,14 @@ hr.soften {
   margin-bottom: 0;
 }
 .show-grid .show-grid [class*="span"] {
+  margin-top: 5px;
+}
+.show-grid [class*="span"] [class*="span"] {
   background-color: #ccc;
 }
+.show-grid [class*="span"] [class*="span"] [class*="span"] {
+  background-color: #999;
+}
 
 
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index ec548ace22..5261ea6160 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -301,13 +301,21 @@

Fluid nesting

-

Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.

+

Fluid grids utilize nesting differently: each nested level of columns should add up to 12 columns. This is because the fluid grid uses percentages, not pixels, for setting widths.

Fluid 12
Fluid 6 +
+
+ Fluid 6 +
+
+ Fluid 6 +
+
Fluid 6 @@ -320,7 +328,13 @@ <div class="span12"> Fluid 12 <div class="row-fluid"> - <div class="span6">Fluid 6</div> + <div class="span6"> + Fluid 6 + <div class="row-fluid"> + <div class="span6">Fluid 6</div> + <div class="span6">Fluid 6</div> + </div> + </div> <div class="span6">Fluid 6</div> </div> </div> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 85ae5ea029..99bdb46f5e 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -230,13 +230,21 @@

{{_i}}Fluid nesting{{/i}}

-

{{_i}}Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.{{/i}}

+

{{_i}}Fluid grids utilize nesting differently: each nested level of columns should add up to 12 columns. This is because the fluid grid uses percentages, not pixels, for setting widths.{{/i}}

{{_i}}Fluid 12{{/i}}
{{_i}}Fluid 6{{/i}} +
+
+ {{_i}}Fluid 6{{/i}} +
+
+ {{_i}}Fluid 6{{/i}} +
+
{{_i}}Fluid 6{{/i}} @@ -249,7 +257,13 @@ <div class="span12"> {{_i}}Fluid 12{{/i}} <div class="row-fluid"> - <div class="span6">{{_i}}Fluid 6{{/i}}</div> + <div class="span6"> + {{_i}}Fluid 6{{/i}} + <div class="row-fluid"> + <div class="span6">{{_i}}Fluid 6{{/i}}</div> + <div class="span6">{{_i}}Fluid 6{{/i}}</div> + </div> + </div> <div class="span6">{{_i}}Fluid 6{{/i}}</div> </div> </div> From a8b9342aea29632928cac4c3458faf80c682d9d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 3 Nov 2012 13:37:34 -0700 Subject: [PATCH 6/7] Fixes #5739: Port in HTML5 BP print styles --- docs/assets/css/bootstrap.css | 65 ++++++++++++++++++++++++++++++++ less/reset.less | 70 +++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 83c9bec75a..c3ce287a80 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -210,6 +210,71 @@ a:hover { border-radius: 500px; } +/* ========================================================================== + Print styles. + Inlined to avoid required HTTP connection: h5bp.com/r + ========================================================================== */ + +@media print { + { + /* + * Don't show links for images, or javascript/internal links + */ + + } + * { + color: #000 !important; + text-shadow: none !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + /* h5bp.com/t */ + + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 0.5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } +} + .row { margin-left: -20px; *zoom: 1; diff --git a/less/reset.less b/less/reset.less index fa2a3724b8..aec4687638 100644 --- a/less/reset.less +++ b/less/reset.less @@ -144,3 +144,73 @@ textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser } + + +// Printing +// ------------------------- +// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css + +@media print { + + * { + text-shadow: none !important; + color: #000 !important; // Black prints faster: h5bp.com/s + background: transparent !important; + box-shadow: none !important; + } + + a, + a:visited { + text-decoration: underline; + } + + a[href]:after { + content: " (" attr(href) ")"; + } + + abbr[title]:after { + content: " (" attr(title) ")"; + } + + // Don't show links for images, or javascript/internal links + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + + thead { + display: table-header-group; // h5bp.com/t + } + + tr, + img { + page-break-inside: avoid; + } + + img { + max-width: 100% !important; + } + + @page { + margin: 0.5cm; + } + + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + + h2, + h3 { + page-break-after: avoid; + } +} \ No newline at end of file From 2c931902832348b0c1425e9dd3c7059bfcb2a918 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 3 Nov 2012 13:42:08 -0700 Subject: [PATCH 7/7] Fixes #5776: Reside white-space for popovers --- docs/assets/css/bootstrap.css | 118 +++++++++++++++------------------- less/popovers.less | 4 +- 2 files changed, 56 insertions(+), 66 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c3ce287a80..b921274a02 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -137,6 +137,58 @@ textarea { vertical-align: top; } +@media print { + * { + color: #000 !important; + text-shadow: none !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 0.5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } +} + .clearfix { *zoom: 1; } @@ -210,71 +262,6 @@ a:hover { border-radius: 500px; } -/* ========================================================================== - Print styles. - Inlined to avoid required HTTP connection: h5bp.com/r - ========================================================================== */ - -@media print { - { - /* - * Don't show links for images, or javascript/internal links - */ - - } - * { - color: #000 !important; - text-shadow: none !important; - background: transparent !important; - box-shadow: none !important; - } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - thead { - display: table-header-group; - /* h5bp.com/t */ - - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 0.5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - page-break-after: avoid; - } -} - .row { margin-left: -20px; *zoom: 1; @@ -5236,6 +5223,7 @@ input[type="submit"].btn.btn-mini { display: none; width: 236px; padding: 1px; + white-space: normal; background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); diff --git a/less/popovers.less b/less/popovers.less index a4c4bb0e07..4a36db4e8d 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -20,12 +20,14 @@ .border-radius(6px); .box-shadow(0 5px 10px rgba(0,0,0,.2)); + // Overrides for proper insertion + white-space: normal; + // Offset the popover to account for the popover arrow &.top { margin-top: -10px; } &.right { margin-left: 10px; } &.bottom { margin-top: 10px; } &.left { margin-left: -10px; } - } .popover-title {