diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 309b07b28..5bde2636e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -128,6 +128,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; + } +} + body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -4561,6 +4613,7 @@ input[type="button"].btn-block { 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); @@ -4776,6 +4829,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/assets/css/docs.css b/docs/assets/css/docs.css index 8af21ddef..8852926d3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -328,8 +328,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; +} .show-grid [class*="span"]:nth-child(even) { background-color: #ddd; diff --git a/docs/assets/js/README.md b/docs/assets/js/README.md index b58fa1d40..66903c71a 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 7fe561b97..4a3e8459a 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -190,7 +190,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.

@@ -224,7 +224,7 @@
Full Name
- first.last@gmail.com + first.last@example.com 
@@ -237,7 +237,7 @@
 
 <address>
   <strong>Full Name</strong><br>
-  <a href="mailto:#">first.last@gmail.com</a>
+  <a href="mailto:#">first.last@example.com</a>
 </address>
diff --git a/docs/components.html b/docs/components.html index e5486d1e3..969bd0eeb 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1644,6 +1644,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/customize.html b/docs/customize.html index 57f1a0b38..18a8debae 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -142,7 +142,6 @@

Miscellaneous

- diff --git a/docs/javascript.html b/docs/javascript.html index 6595784c6..1b14e4430 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -134,7 +134,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
@@ -505,7 +505,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.

         
 
 
@@ -634,7 +634,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>
 

 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 02e53c0ac..62eff9740 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1575,6 +1575,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/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache
index 386f6930a..6674da87b 100644
--- a/docs/templates/pages/customize.mustache
+++ b/docs/templates/pages/customize.mustache
@@ -73,7 +73,6 @@

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

- diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index e34d56150..913c8aa95 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -65,7 +65,7 @@ $("#myModal").modal('show') // initializes and invokes show immed

{{_i}}Events{{/i}}

{{_i}}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.{{/i}}

-

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

+

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

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

           
$().dropdown('toggle')

-          
{{_i}}A programatic api for toggling menus for a given navbar or tabbed navigation.{{/i}}

+          
{{_i}}A programmatic api for toggling menus for a given navbar or tabbed navigation.{{/i}}

         
 
 
@@ -566,7 +566,7 @@ $('[data-spy="scroll"]').each(function () {
 
 
           
{{_i}}Example tabs{{/i}}

-          
{{_i}}Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.{{/i}}

+          
{{_i}}Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.{{/i}}