From cfc2353059df628c67d19a3c5c3ead2cc6051f53 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 6 Jan 2012 23:59:22 -0800 Subject: front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates --- docs/base-css.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 399a41463..cbdf5ea19 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1044,6 +1044,20 @@

Here's more help text

+
+ +
+ + + +
+
-- cgit v1.2.3 From 36e7660383a7639f5d538efb7dc0f349e285b42d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 00:26:58 -0800 Subject: fix forms in navbars, fix examples' navbars --- docs/base-css.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index cbdf5ea19..cc92bc221 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1102,6 +1102,7 @@

Checkboxes and radios

Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.

+

Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.

-- cgit v1.2.3 From bcf1136f2c8236cd3fa28eac7e57a9a3fc17d104 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 00:47:53 -0800 Subject: fix form field sizing for selects, document form field grid sizing --- docs/base-css.html | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index cc92bc221..b8a6a2f8d 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1024,6 +1024,15 @@
Extending form controls +
+ +
+ + + +

Use the same .span* classes from the grid system for input sizes.

+
+
-- cgit v1.2.3 From d6a1402f2af5111e11a87a6029b642dc0b814854 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 01:03:26 -0800 Subject: update form shadows and tweak prettyprint styles --- docs/base-css.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index b8a6a2f8d..5ae1790f7 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1009,8 +1009,9 @@

Form validation

It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.

-
-<fieldset class="control-group error">
+
+<fieldset
+  class="control-group error">
   ...
 </fieldset>
 

-- 
cgit v1.2.3


From 45d671d97f4d448780729bbb6357e9ec776f980c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 01:22:52 -0800
Subject: tweak spacing once more on prettify; add support for uneditable
 inputs to input-append and prepend

---
 docs/base-css.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 5ae1790f7..910ea10bb 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1039,7 +1039,7 @@
           

             

               @
-              
+              
             

             
Here's some help text

           

@@ -1048,7 +1048,7 @@
           
           

             

-              
+              
               .00
             

             
Here's more help text

-- 
cgit v1.2.3


From 8ccc3bcf03fedbe8c3a19a96c08a5cad6ae456e8 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 03:45:24 -0800
Subject: overhauled dropdowns now require use of .caret for dropdown arrow,
 redid the button group docs section, added the split button dropdown docs
 section

---
 docs/base-css.html | 142 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 125 insertions(+), 17 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 910ea10bb..5a8b0b267 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1203,17 +1203,12 @@
 
   

 
+  
Button groups Join buttons for more toolbar-like functionality

   

     

-      
Button groups

-      
Use button groups to join multiple buttons together as one composite component. Just build them with a series of <a> or <button> elements. Button groups can also function as radios and checkboxes (see the Javascript docs for that).

-      
You can also combine sets of button groups into a toolbar for more complex projects.

-      
Get the javascript »

-      
Heads up: CSS for button groups is in a separate file, button-groups.less.

-    

-    

-      
Linked button group

-      
Using the standard <a class="btn" href="#">...</a> markup, simply add all the buttons you need.

+      
Button groups

+      
Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.

+      
You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.

       

         

           Left
@@ -1221,7 +1216,6 @@
           Right
         

       

-      
Level up one more time by wrapping multiple instances of <div class="btn-group"> with <div class="btn-toolbar">.

       

         

           

@@ -1229,24 +1223,132 @@
             2
             3
             4
-            5
           

           

+            5
             6
             7
-            8
-          

-          

-            9
           

           

-            10
+            8
           

         

       

+
+    

+    

+      
Example markup

+      
Here's how the HTML looks for a standard button group built with anchor tag buttons:

+
+<div class="btn-group">
+  <a class="btn" href="#">1</a>
+  <a class="btn" href="#">2</a>
+  <a class="btn" href="#">3</a>
+</div>
+

+      
And with a toolbar for multiple groups:

+
+<div class="btn-toolbar">
+  <div class="btn-group">
+    ...
+  </div>
+</div>
+

+    

+    

+      
Checkbox and radio flavors

+      
Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the Javascript docs for that.

+      
Get the javascript »

+      

+      
Heads up

+      
CSS for button groups is in a separate file, button-groups.less.

+    

+  

+  
+  

+  
Button dropdowns Built on button groups to provide contextual menus

+  

+    

+      
Split button dropdowns

+      
Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.

+      

+        

+          

+            Action
+            
+            
+          
        
+          

+            Action
+            
+            
+          
     
+          

+            Danger
+            
+            
+          

+        

+        

+          

+            Success
+            
+            
+          

+          

+            Info
+            
+            
+          

+        

+      
 
+    

+    

+      
Example markup

+      
Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.

+
+<div class="btn-group">
+  <a class="btn" href="#">Action</a>
+  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+    <!-- dropdown menu links -->
+  </ul>
+</div>
+

     

   

-    
 
 
 
@@ -1454,5 +1556,11 @@
     
     
     
+    
+    
   
 
-- 
cgit v1.2.3