From 9f5b619094e9023d775e2ebd438ed2d327baeda2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 07:49:28 -0800 Subject: [PATCH] add in regular button dropdowns, rejigger the button dropdowns section to reflect change --- docs/assets/bootstrap.zip | Bin 51960 -> 51960 bytes docs/components.html | 81 ++++++++++++++++++++++- docs/templates/pages/components.mustache | 81 ++++++++++++++++++++++- 3 files changed, 158 insertions(+), 4 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 0fd6d9d5c4680e754a0b5d920dca1f5d6c0714e2..7e6f0e7a309cc60fbc509178c931528eeccbdcc7 100644 GIT binary patch delta 451 zcmew{mHEe1W}X0VW)?065Kyw4$fL;iez%(chuxC{j|+1lNd%~}eSk|$?BiepDxP5k zRlM=S9(|y|xYJL zGB6|ThgdVYCC?db&->k*&*oJMfQ;~{w}lCH*H?puI3}oIxNx%n1Ou2=trK1=fV38E zG=T}N*|=8(B$RzjpXoiw$Ko8YfSA1dm@yML6l6gv_>Vh4RDgK}$6b)*t{(SB;yIph thwxC$l9_z;ggBB3e@_G=@$yf4W7vQDq!E&-dZ+A=c)h2bK)j2m)B!Yhvg7~& delta 451 zcmew{mHEe1W}X0VW)?065MZ~R$fL-1Z>O67{hgBoj|+3bBsgp*2B@;#hf7TC<6r_R zo?!%5d~fH*3w!i|0+ag;%%IvgpE7u^!^B}bd2_5SRO9Avu`cW&A)8c7m{4`H47|oD9qe`ytj$Zpm|o+Ozp=UZnuYB9D4om{50pwE)OejtMGgE(8ktPcVR4 z)jHv|0!UraMiZFOnvHu!K&E9M(`UK|^07DvBp`swb{{il0*8VuNCp3K2Z#zVui&@~ zj0aSC^|&`oC6MQM!X3hcnFZ9n`
-

Buttons dropdowns Built on button groups to provide contextual dropdown menus

+

Buttons dropdowns Contextual dropdown menus built on button groups

+ +
+
+

Button dropdowns

+

Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.

+
+
+ 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 dropdown-toggle" data-toggle="dropdown" href="#">
+    Action
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+    <!-- dropdown menu links -->
+  </ul>
+</div>
+
+
+
+

Split button dropdowns

@@ -247,7 +324,7 @@

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.

+

We expand on the normal button dropdowns to provide a second button action that operates as a separate dropdown trigger.

 <div class="btn-group">
   <a class="btn" href="#">Action</a>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 4997b2990b..b257cd4d13 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -103,8 +103,85 @@
 ================================================== -->
 

   

-    
{{_i}}Buttons dropdowns{{/i}} {{_i}}Built on button groups to provide contextual dropdown menus{{/i}}

+    
{{_i}}Buttons dropdowns{{/i}} {{_i}}Contextual dropdown menus built on button groups{{/i}}

   

+
+  

+    

+      
{{_i}}Button dropdowns{{/i}}

+      
{{_i}}Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.{{/i}}

+      

+        

+          {{_i}}Action{{/i}} 
+          
+        

+        

+          {{_i}}Action{{/i}} 
+          
+        

+        

+          {{_i}}Danger{{/i}} 
+          
+        

+      

+      

+        

+          {{_i}}Success{{/i}} 
+          
+        

+        

+          {{_i}}Info{{/i}} 
+          
+        

+      

+    

+    

+      
{{_i}}Example markup{{/i}}

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

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

+    

+  

+
   

     

       
{{_i}}Split button dropdowns{{/i}}

@@ -171,7 +248,7 @@
     

     

       
{{_i}}Example markup{{/i}}

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

+      
{{_i}}We expand on the normal button dropdowns to provide a second button action that operates as a separate dropdown trigger.{{/i}}

 
 <div class="btn-group">
   <a class="btn" href="#">{{_i}}Action{{/i}}</a>