diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 54825 -> 54825 bytes | |||
| -rw-r--r-- | docs/components.html | 13 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 15 |
3 files changed, 9 insertions, 19 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex ba68e8c58..feabc4941 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/components.html b/docs/components.html index 3a3ac15fc..9c4c420b6 100644 --- a/docs/components.html +++ b/docs/components.html @@ -270,8 +270,6 @@ </ul> </div><!-- /btn-group --> </div><!-- /btn-toolbar --> - <hr> - <p><span class="label label-info">Heads up!</span> Button dropdowns require the <a href="./javascript.html#dropdowns">Bootstrap dropdown plugin</a> to function.</p> </div> <div class="span8"> <h3>Example markup</h3> @@ -327,15 +325,12 @@ </div><!-- /btn-toolbar --> </div><!--/span--> <div class="span4"> - - </div><!--/span--> - <div class="span4"> - + <h3>Requires javascript</h3> + <p>Button dropdowns require the <a href="./javascript.html#dropdowns">Bootstrap dropdown plugin</a> to function.</p> + <p>In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.</p> </div><!--/span--> </div><!--/row--> - <div class="alert alert-info"> - <strong>Heads up!</strong> In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript. - </div> + <br> <h2>Split button dropdowns</h2> <div class="row"> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index b52919995..1dd3d87bb 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -194,8 +194,6 @@ </ul> </div><!-- /btn-group --> </div><!-- /btn-toolbar --> - <hr> - <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}Button dropdowns require the <a href="./javascript.html#dropdowns">Bootstrap dropdown plugin</a> to function.{{/i}}</p> </div> <div class="span8"> <h3>{{_i}}Example markup{{/i}}</h3> @@ -216,7 +214,7 @@ <div class="row"> <div class="span4"> <h3>{{_i}}Works with all button sizes{{/i}}</h3> - <p>Button dropdowns work at any size. your button sizes to <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code>.</p> + <p>{{_i}}Button dropdowns work at any size. your button sizes to <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code>.{{/i}}</p> <div class="btn-toolbar" style="margin-top: 18px;"> <div class="btn-group"> <button class="btn btn-large dropdown-toggle" data-toggle="dropdown">{{_i}}Large button{{/i}} <span class="caret"></span></button> @@ -251,15 +249,12 @@ </div><!-- /btn-toolbar --> </div><!--/span--> <div class="span4"> - - </div><!--/span--> - <div class="span4"> - + <h3>{{_i}}Requires javascript{{/i}}</h3> + <p>{{_i}}Button dropdowns require the <a href="./javascript.html#dropdowns">Bootstrap dropdown plugin</a> to function.{{/i}}</p> + <p>{{_i}}In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.{{/i}}</p> </div><!--/span--> </div><!--/row--> - <div class="alert alert-info"> - <strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.{{/i}} - </div> + <br> <h2>{{_i}}Split button dropdowns{{/i}}</h2> <div class="row"> |