diff --git a/docs/base-css.html b/docs/base-css.html index 2b7c1ec712..3df5a114be 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1136,13 +1136,13 @@ For example, <code>section</code> should be wrapped as inline.
- + 
 <div class="form-actions">
   <button type="submit" class="btn btn-primary">Save changes</button>
-  <button class="btn">Cancel</button>
+  <button type="button" class="btn">Cancel</button>
 </div>
@@ -1263,37 +1263,37 @@ For example, <code>section</code> should be wrapped as inline. - + btn Standard gray button with gradient - + btn btn-primary Provides extra visual weight and identifies the primary action in a set of buttons - + btn btn-info Used as an alternative to the default styles - + btn btn-success Indicates a successful or positive action - + btn btn-warning Indicates caution should be taken with this action - + btn btn-danger Indicates a dangerous or potentially negative action - + btn btn-inverse Alternate dark gray button, not tied to a semantic action or use @@ -1310,16 +1310,16 @@ For example, <code>section</code> should be wrapped as inline.

Button sizes

Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.

- - + +

- - + +

- - + +

@@ -1347,12 +1347,12 @@ For example, <code>section</code> should be wrapped as inline.

Button element

Add the disabled attribute to <button> buttons.

- - + + 

-<button class="btn btn-large btn-primary disabled" disabled="disabled">Primary button</button>
-<button class="btn btn-large" disabled>Button</button>
+<button type="button" class="btn btn-large btn-primary disabled" disabled="disabled">Primary button</button>
+<button type="button" class="btn btn-large" disabled>Button</button>
diff --git a/docs/javascript.html b/docs/javascript.html index 7fb1448ec0..1679c0e7fd 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1086,37 +1086,37 @@ $('#my-alert').bind('closed', function () {

Stateful

Add data-loading-text="Loading..." to use a loading state on a button.

- 
-<button class="btn btn-primary" data-loading-text="Loading...">Loading state</button>
+<button type="button" class="btn btn-primary" data-loading-text="Loading...">Loading state</button>

Single toggle

Add data-toggle="button" to activate toggling on a single button.

- + 
-<button class="btn" data-toggle="button">Single Toggle</button>
+<button type="button" class="btn" data-toggle="button">Single Toggle</button>

Checkbox

Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group.

- - - + + + 
 <div class="btn-group" data-toggle="buttons-checkbox">
-  <button class="btn">Left</button>
-  <button class="btn">Middle</button>
-  <button class="btn">Right</button>
+  <button type="button" class="btn">Left</button>
+  <button type="button" class="btn">Middle</button>
+  <button type="button" class="btn">Right</button>
 </div>
@@ -1124,16 +1124,16 @@ $('#my-alert').bind('closed', function () {

Add data-toggle="buttons-radio" for radio style toggling on btn-group.

- - - + + + 
 <div class="btn-group" data-toggle="buttons-radio">
-  <button class="btn">Left</button>
-  <button class="btn">Middle</button>
-  <button class="btn">Right</button>
+  <button type="button" class="btn">Left</button>
+  <button type="button" class="btn">Middle</button>
+  <button type="button" class="btn">Right</button>
 </div>
@@ -1158,11 +1158,11 @@ $('#my-alert').bind('closed', function () { Heads up! You can enable auto toggling of a button by using the data-toggle attribute. - 
<button class="btn" data-toggle="button" >…</button>
+ 
<button type="button" class="btn" data-toggle="button" >…</button>

$().button('loading')

Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text.

- 
<button class="btn" data-loading-text="loading stuff..." >...</button>
+ 
<button type="button" class="btn" data-loading-text="loading stuff..." >...</button>
Heads up! Firefox persists the disabled state across page loads. A workaround for this is to use autocomplete="off". @@ -1171,7 +1171,7 @@ $('#my-alert').bind('closed', function () {

Resets button state - swaps text to original text.

$().button(string)

Resets button state - swaps text to any data defined text state.

-
<button class="btn" data-complete-text="finished!" >...</button>
+
<button type="button" class="btn" data-complete-text="finished!" >...</button>
 <script>
   $('.btn').button('complete')
 </script>

@@ -1234,7 +1234,7 @@ $('#my-alert').bind('closed', function () {
     
-<button class="btn btn-danger" data-toggle="collapse" data-target="#demo">
+<button type="button" class="btn btn-danger" data-toggle="collapse" data-target="#demo">
   simple collapsible
 </button>
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 9b79c3d9c5..5435689bde 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1067,13 +1067,13 @@
   

     

       
-      
+      
     

   

 
 <div class="form-actions">
   <button type="submit" class="btn btn-primary">{{_i}}Save changes{{/i}}</button>
-  <button class="btn">{{_i}}Cancel{{/i}}</button>
+  <button type="button" class="btn">{{_i}}Cancel{{/i}}</button>
 </div>
 

 
@@ -1194,37 +1194,37 @@
     
     
       
-        
+        
         btn
         {{_i}}Standard gray button with gradient{{/i}}
       
       
-        
+        
         btn btn-primary
         {{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}
       
       
-        
+        
         btn btn-info
         {{_i}}Used as an alternative to the default styles{{/i}}
       
       
-        
+        
         btn btn-success
         {{_i}}Indicates a successful or positive action{{/i}}
       
       
-        
+        
         btn btn-warning
         {{_i}}Indicates caution should be taken with this action{{/i}}
       
       
-        
+        
         btn btn-danger
         {{_i}}Indicates a dangerous or potentially negative action{{/i}}
       
       
-        
+        
         btn btn-inverse
         {{_i}}Alternate dark gray button, not tied to a semantic action or use{{/i}}
       
@@ -1241,16 +1241,16 @@
   
{{_i}}Button sizes{{/i}}

   
{{_i}}Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.{{/i}}

   

-    
-    
+    
+    
   

   

-    
-    
+    
+    
   

   

-    
-    
+    
+    
   

 
 
@@ -1278,12 +1278,12 @@
   
Button element

   
{{_i}}Add the disabled attribute to <button> buttons.{{/i}}

   

-    
-    
+    
+    
   

 
-<button class="btn btn-large btn-primary disabled" disabled="disabled">{{_i}}Primary button{{/i}}</button>
-<button class="btn btn-large" disabled>{{_i}}Button{{/i}}</button>
+<button type="button" class="btn btn-large btn-primary disabled" disabled="disabled">{{_i}}Primary button{{/i}}</button>
+<button type="button" class="btn btn-large" disabled>{{_i}}Button{{/i}}</button>
 

 
 
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index a73917f5e3..6f51417fa0 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1011,37 +1011,37 @@ $('#my-alert').bind('closed', function () {
   
{{_i}}Stateful{{/i}}

   
{{_i}}Add data-loading-text="Loading..." to use a loading state on a button.{{/i}}

   

-    
   
{{! /example }}
 
-<button class="btn btn-primary" data-loading-text="Loading...">Loading state</button>
+<button type="button" class="btn btn-primary" data-loading-text="Loading...">Loading state</button>
 

 
   
{{_i}}Single toggle{{/i}}

   
{{_i}}Add data-toggle="button" to activate toggling on a single button.{{/i}}

   

-    
+    
   
{{! /example }}
 
-<button class="btn" data-toggle="button">Single Toggle</button>
+<button type="button" class="btn" data-toggle="button">Single Toggle</button>
 

 
   
{{_i}}Checkbox{{/i}}

   
{{_i}}Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group.{{/i}}

   

     

-      
-      
-      
+      
+      
+      
     

   
{{! /example }}
 
 <div class="btn-group" data-toggle="buttons-checkbox">
-  <button class="btn">Left</button>
-  <button class="btn">Middle</button>
-  <button class="btn">Right</button>
+  <button type="button" class="btn">Left</button>
+  <button type="button" class="btn">Middle</button>
+  <button type="button" class="btn">Right</button>
 </div>
 

 
@@ -1049,16 +1049,16 @@ $('#my-alert').bind('closed', function () {
   
{{_i}}Add data-toggle="buttons-radio" for radio style toggling on btn-group.{{/i}}

   

     

-      
-      
-      
+      
+      
+      
     

   
{{! /example }}
 
 <div class="btn-group" data-toggle="buttons-radio">
-  <button class="btn">Left</button>
-  <button class="btn">Middle</button>
-  <button class="btn">Right</button>
+  <button type="button" class="btn">Left</button>
+  <button type="button" class="btn">Middle</button>
+  <button type="button" class="btn">Right</button>
 </div>
 

 
@@ -1083,11 +1083,11 @@ $('#my-alert').bind('closed', function () {
     {{_i}}Heads up!{{/i}}
     {{_i}}You can enable auto toggling of a button by using the data-toggle attribute.{{/i}}
   
-  
<button class="btn" data-toggle="button" >…</button>

+  
<button type="button" class="btn" data-toggle="button" >…</button>

   
$().button('loading')

   
{{_i}}Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text.{{/i}}
   

-  
<button class="btn" data-loading-text="loading stuff..." >...</button>

+  
<button type="button" class="btn" data-loading-text="loading stuff..." >...</button>

   

     {{_i}}Heads up!{{/i}}
     {{_i}}Firefox persists the disabled state across page loads. A workaround for this is to use autocomplete="off".{{/i}}
@@ -1096,7 +1096,7 @@ $('#my-alert').bind('closed', function () {
   
{{_i}}Resets button state - swaps text to original text.{{/i}}

   
$().button(string)

   
{{_i}}Resets button state - swaps text to any data defined text state.{{/i}}

-
<button class="btn" data-complete-text="finished!" >...</button>
+
<button type="button" class="btn" data-complete-text="finished!" >...</button>
 <script>
   $('.btn').button('complete')
 </script>

@@ -1159,7 +1159,7 @@ $('#my-alert').bind('closed', function () {
     

   {{! /example }}
 
-<button class="btn btn-danger" data-toggle="collapse" data-target="#demo">
+<button type="button" class="btn btn-danger" data-toggle="collapse" data-target="#demo">
   {{_i}}simple collapsible{{/i}}
 </button>