From d71efb855bda3ecd0b0fd079d2d9cb231c8ba71b Mon Sep 17 00:00:00 2001 From: Erik van der Kolk Date: Sat, 18 Aug 2012 19:21:01 +0200 Subject: [PATCH] Separate Buttons examples in Icon examples section and add code snippets --- docs/base-css.html | 66 ++++++++++++++++++++------ docs/templates/pages/base-css.mustache | 66 ++++++++++++++++++++------ 2 files changed, 102 insertions(+), 30 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index 1428e38ec0..40bfbcf066 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1770,30 +1770,66 @@ For example, <code>section</code> should be wrapped as inline.

Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.

Buttons

+ +
Button group in a button toolbar
-
+
-

-
- User - - -
-

-
+
+<div class="btn-toolbar">
+  <div class="btn-group">
+
+    <a class="btn" href="#"><i class="icon-align-left"></i></a>
+    <a class="btn" href="#"><i class="icon-align-center"></i></a>
+    <a class="btn" href="#"><i class="icon-align-right"></i></a>
+    <a class="btn" href="#"><i class="icon-align-justify"></i></a>
+  </div>
+</div>
+
+ +
Dropdown in a button group
+
+
+ User + + +
+
+
+<div class="btn-group">
+  <a class="btn btn-primary" href="#"><i class="icon-user icon-white"></i> User</a>
+  <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
+  <ul class="dropdown-menu">
+    <li><a href="#"><i class="icon-pencil"></i> Edit</a></li>
+    <li><a href="#"><i class="icon-trash"></i> Delete</a></li>
+    <li><a href="#"><i class="icon-ban-circle"></i> Ban</a></li>
+    <li class="divider"></li>
+    <li><a href="#"><i class="i"></i> Make admin</a></li>
+  </ul>
+</div>
+
+ +
Button
+
+ +
+
+<a class="btn btn-small" href="#"><i class="icon-star"></i></a>
+
+

Navigation

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index d8af4eaabf..e1e14a4a0d 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1707,30 +1707,66 @@

{{_i}}Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.{{/i}}

{{_i}}Buttons{{/i}}

+ +
{{_i}}Button group in a button toolbar{{/i}}
-
+
-

-
- {{_i}}User{{/i}} - - -
-

-
{{! /bs-docs-example }} +
+<div class="btn-toolbar">
+  <div class="btn-group">
+
+    <a class="btn" href="#"><i class="icon-align-left"></i></a>
+    <a class="btn" href="#"><i class="icon-align-center"></i></a>
+    <a class="btn" href="#"><i class="icon-align-right"></i></a>
+    <a class="btn" href="#"><i class="icon-align-justify"></i></a>
+  </div>
+</div>
+
+ +
{{_i}}Dropdown in a button group{{/i}}
+
+
+ {{_i}}User{{/i}} + + +
+
{{! /bs-docs-example }} +
+<div class="btn-group">
+  <a class="btn btn-primary" href="#"><i class="icon-user icon-white"></i> {{_i}}User{{/i}}</a>
+  <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
+  <ul class="dropdown-menu">
+    <li><a href="#"><i class="icon-pencil"></i> {{_i}}Edit{{/i}}</a></li>
+    <li><a href="#"><i class="icon-trash"></i> {{_i}}Delete{{/i}}</a></li>
+    <li><a href="#"><i class="icon-ban-circle"></i> {{_i}}Ban{{/i}}</a></li>
+    <li class="divider"></li>
+    <li><a href="#"><i class="i"></i> {{_i}}Make admin{{/i}}</a></li>
+  </ul>
+</div>
+
+ +
{{_i}}Button{{/i}}
+
+ +
{{! /bs-docs-example }} +
+<a class="btn btn-small" href="#"><i class="icon-star"></i></a>
+
+

{{_i}}Navigation{{/i}}