From 0f3a073b8dca534e78c09b71999d5a2632e2245d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 21:15:57 -0800 Subject: *really* refactor the buttons and update them all over the docs --- docs/templates/pages/base-css.mustache | 68 ++++++++++++++++---------------- docs/templates/pages/components.mustache | 24 +++++------ docs/templates/pages/download.mustache | 8 ++-- docs/templates/pages/index.mustache | 4 +- docs/templates/pages/javascript.mustache | 30 +++++++------- 5 files changed, 67 insertions(+), 67 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 433a18c88..c000c9c88 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -756,11 +756,6 @@ .form-vertical ({{_i}}not required{{/i}}) {{_i}}Stacked, left-aligned labels over controls{{/i}} - - {{_i}}Horizontal{{/i}} - .form-horizontal - {{_i}}Float left, right-aligned labels on same line as controls{{/i}} - {{_i}}Inline{{/i}} .form-inline @@ -771,6 +766,11 @@ .form-search {{_i}}Extra-rounded text input for a typical search aesthetic{{/i}} + + {{_i}}Horizontal{{/i}} + .form-horizontal + {{_i}}Float left, right-aligned labels on same line as controls{{/i}} + @@ -879,7 +879,7 @@
- +
@@ -972,7 +972,7 @@
- +
@@ -1096,7 +1096,7 @@
- +
@@ -1139,28 +1139,28 @@ {{_i}}Standard gray button with gradient{{/i}} - {{_i}}Primary{{/i}} - .primary + {{_i}}Primary{{/i}} + .btn-primary {{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}} - {{_i}}Info{{/i}} - .info + {{_i}}Info{{/i}} + .btn-info {{_i}}Used as an alternate to the default styles{{/i}} - {{_i}}Success{{/i}} - .success + {{_i}}Success{{/i}} + .btn-success {{_i}}Indicates a successful or positive action{{/i}} - {{_i}}Warning{{/i}} - .warning + {{_i}}Warning{{/i}} + .btn-warning {{_i}}Indicates caution should be taken with this action{{/i}} - {{_i}}Danger{{/i}} - .danger + {{_i}}Danger{{/i}} + .btn-danger {{_i}}Indicates a dangerous or potentially negative action{{/i}} @@ -1185,24 +1185,24 @@

{{_i}}Multiple sizes{{/i}}

{{_i}}Fancy larger or smaller buttons? Have at it!{{/i}}

- {{_i}}Primary action{{/i}} - {{_i}}Action{{/i}} + {{_i}}Primary action{{/i}} + {{_i}}Action{{/i}}

- {{_i}}Primary action{{/i}} - {{_i}}Action{{/i}} + {{_i}}Primary action{{/i}} + {{_i}}Action{{/i}}

{{_i}}Disabled state{{/i}}

-

{{_i}}For disabled buttons, use .disabled for links and :disabled for <button> elements.{{/i}}

+

{{_i}}For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.{{/i}}

- {{_i}}Primary action{{/i}} - {{_i}}Action{{/i}} + {{_i}}Primary action{{/i}} + {{_i}}Action{{/i}}

- - + +

@@ -1415,8 +1415,8 @@
- {{_i}}User{{/i}} - + {{_i}}User{{/i}} +

{{_i}}Refresh{{/i}} - {{_i}}Checkout{{/i}} - {{_i}}Delete{{/i}} + {{_i}}Checkout{{/i}} + {{_i}}Delete{{/i}}

- {{_i}}Comment{{/i}} - {{_i}}Settings{{/i}} - {{_i}}More Info{{/i}} + {{_i}}Comment{{/i}} + {{_i}}Settings{{/i}} + {{_i}}More Info{{/i}}

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 214478966..e61d83152 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -122,7 +122,7 @@
- {{_i}}Action{{/i}} + {{_i}}Action{{/i}}
- {{_i}}Danger{{/i}} + {{_i}}Danger{{/i}}
- {{_i}}Success{{/i}} + {{_i}}Success{{/i}}
- {{_i}}Info{{/i}} + {{_i}}Info{{/i}}
- {{_i}}Action{{/i}} - + {{_i}}Action{{/i}} +
- {{_i}}Danger{{/i}} - + {{_i}}Danger{{/i}} +
- {{_i}}Success{{/i}} - + {{_i}}Success{{/i}} +
- {{_i}}Info{{/i}} - + {{_i}}Info{{/i}} +
@@ -163,11 +163,11 @@

{{_i}}This link and that link should have tooltips on hover.{{/i}}

- {{_i}}Save changes{{/i}} + {{_i}}Save changes{{/i}} {{_i}}Close{{/i}}
- {{_i}}Launch demo modal{{/i}} + {{_i}}Launch demo modal{{/i}}
@@ -216,7 +216,7 @@ <p>{{_i}}One fine body…{{/i}}</p> </div> <div class="modal-footer"> - <a href="#" class="btn primary">{{_i}}Save changes{{/i}}</a> + <a href="#" class="btn btn-primary">{{_i}}Save changes{{/i}}</a> <a href="#" class="btn">{{_i}}Close{{/i}}</a> </div> </div> @@ -726,7 +726,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

{{_i}}Example hover popover{{/i}}

{{_i}}Hover over the button to trigger the popover.{{/i}}

- {{_i}}hover for popover{{/i}} + {{_i}}hover for popover{{/i}}

{{_i}}Using bootstrap-popover.js{{/i}}

@@ -841,7 +841,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

{{_i}}Oh snap! You got an error!{{/i}}

{{_i}}Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.{{/i}}

- {{_i}}Take this action{{/i}} {{_i}}Or do this{{/i}} + {{_i}}Take this action{{/i}} {{_i}}Or do this{{/i}}

@@ -907,7 +907,7 @@ $('#my-alert').bind('closed', function () { {{_i}}Stateful{{/i}} - @@ -915,16 +915,16 @@ $('#my-alert').bind('closed', function () { {{_i}}Single toggle{{/i}} - + {{_i}}Checkbox{{/i}}
- - - + + +
@@ -932,9 +932,9 @@ $('#my-alert').bind('closed', function () { {{_i}}Radio{{/i}}
- - - + + +
@@ -1082,7 +1082,7 @@ $('#my-alert').bind('closed', function () {

{{_i}}Markup{{/i}}

{{_i}}Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.{{/i}}

-<button class="btn danger" data-toggle="collapse" data-target="#demo">
+<button class="btn btn-danger" data-toggle="collapse" data-target="#demo">
   {{_i}}simple collapsible{{/i}}
 </button>
 
-- 
cgit v1.2.3