From 9f5b619094e9023d775e2ebd438ed2d327baeda2 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
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|<URv4sH)AU44&(Ngf_?8!i2uXy0C+UY*H;@Le;7J!6pUB@Mq?x>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`<ey~Xa
zGW?mj>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`<Tq+qbI~+dVnH-PXr?I@=tn0crZOcb8eqBLNZnF
QlpPYU_mmTeckz@u0F}6{p#T5?
diff --git a/docs/components.html b/docs/components.html
index dc01d07dde..9606167044 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -179,8 +179,85 @@
================================================== -->
<section id="buttonDropdowns">
<div class="page-header">
- <h1>Buttons dropdowns <small>Built on button groups to provide contextual dropdown menus</small></h1>
+ <h1>Buttons dropdowns <small>Contextual dropdown menus built on button groups</small></h1>
</div>
+
+ <div class="row">
+ <div class="span4">
+ <h3>Button dropdowns</h3>
+ <p>Use any button to trigger a dropdown menu by placing it within a <code>.btn-group</code> and providing the proper menu markup.</p>
+ <div class="btn-toolbar" style="margin-top: 18px;">
+ <div class="btn-group">
+ <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Action <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Action</a></li>
+ <li><a href="#">Another action</a></li>
+ <li><a href="#">Something else here</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Separated link</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ <div class="btn-group">
+ <a class="btn primary dropdown-toggle" data-toggle="dropdown" href="#">Action <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Action</a></li>
+ <li><a href="#">Another action</a></li>
+ <li><a href="#">Something else here</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Separated link</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ <div class="btn-group">
+ <a class="btn danger dropdown-toggle" data-toggle="dropdown" href="#">Danger <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Action</a></li>
+ <li><a href="#">Another action</a></li>
+ <li><a href="#">Something else here</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Separated link</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ </div>
+ <div class="btn-toolbar">
+ <div class="btn-group">
+ <a class="btn success dropdown-toggle" data-toggle="dropdown" href="#">Success <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Action</a></li>
+ <li><a href="#">Another action</a></li>
+ <li><a href="#">Something else here</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Separated link</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ <div class="btn-group">
+ <a class="btn info dropdown-toggle" data-toggle="dropdown" href="#">Info <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Action</a></li>
+ <li><a href="#">Another action</a></li>
+ <li><a href="#">Something else here</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Separated link</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ </div>
+ </div>
+ <div class="span8">
+ <h3>Example markup</h3>
+ <p>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.</p>
+<pre class="prettyprint linenums">
+<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>
+</pre>
+ </div>
+ </div>
+
<div class="row">
<div class="span4">
<h3>Split button dropdowns</h3>
@@ -247,7 +324,7 @@
</div>
<div class="span8">
<h3>Example markup</h3>
- <p>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.</p>
+ <p>We expand on the normal button dropdowns to provide a second button action that operates as a separate dropdown trigger.</p>
<pre class="prettyprint linenums">
<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 @@
================================================== -->
<section id="buttonDropdowns">
<div class="page-header">
- <h1>{{_i}}Buttons dropdowns{{/i}} <small>{{_i}}Built on button groups to provide contextual dropdown menus{{/i}}</small></h1>
+ <h1>{{_i}}Buttons dropdowns{{/i}} <small>{{_i}}Contextual dropdown menus built on button groups{{/i}}</small></h1>
</div>
+
+ <div class="row">
+ <div class="span4">
+ <h3>{{_i}}Button dropdowns{{/i}}</h3>
+ <p>{{_i}}Use any button to trigger a dropdown menu by placing it within a <code>.btn-group</code> and providing the proper menu markup.{{/i}}</p>
+ <div class="btn-toolbar" style="margin-top: 18px;">
+ <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">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ <div class="btn-group">
+ <a class="btn primary dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Action{{/i}} <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ <div class="btn-group">
+ <a class="btn danger dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Danger{{/i}} <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ </div>
+ <div class="btn-toolbar">
+ <div class="btn-group">
+ <a class="btn success dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Success{{/i}} <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ <div class="btn-group">
+ <a class="btn info dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Info{{/i}} <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ </div>
+ </div>
+ <div class="span8">
+ <h3>{{_i}}Example markup{{/i}}</h3>
+ <p>{{_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}}</p>
+<pre class="prettyprint linenums">
+<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>
+</pre>
+ </div>
+ </div>
+
<div class="row">
<div class="span4">
<h3>{{_i}}Split button dropdowns{{/i}}</h3>
@@ -171,7 +248,7 @@
</div>
<div class="span8">
<h3>{{_i}}Example markup{{/i}}</h3>
- <p>{{_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}}</p>
+ <p>{{_i}}We expand on the normal button dropdowns to provide a second button action that operates as a separate dropdown trigger.{{/i}}</p>
<pre class="prettyprint linenums">
<div class="btn-group">
<a class="btn" href="#">{{_i}}Action{{/i}}</a>
--
GitLab