From 81679981c539338be9cba6c5650579ec796afb69 Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Wed, 5 Dec 2012 15:28:14 -0800 Subject: Escape × --- docs/templates/pages/base-css.mustache | 2 +- docs/templates/pages/components.mustache | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index b042e34a5..9dcb7127b 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1416,7 +1416,7 @@ </select> -

{{_i}}For multiple grid inputs per line, use the .controls-row modifier class for proper spacing. It floats the inputs to collapse white-space, sets the proper margins, and the clears the float.{{/i}}

+

{{_i}}For multiple grid inputs per line, use the .controls-row modifier class for proper spacing. It floats the inputs to collapse white-space, sets the proper margins, and clears the float.{{/i}}

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 283bdf882..96896b5b3 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1998,16 +1998,16 @@ 
 <div class="alert">
-  <button type="button" class="close" data-dismiss="alert">×</button>
+  <button type="button" class="close" data-dismiss="alert">&times;</button>
   <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
 </div>

{{_i}}Dismiss buttons{{/i}}

{{_i}}Mobile Safari and Mobile Opera browsers, in addition to the data-dismiss="alert" attribute, require an href="#" for the dismissal of alerts when using an <a> tag.{{/i}}

- 
<a href="#" class="close" data-dismiss="alert">×</a>
+ 
<a href="#" class="close" data-dismiss="alert">&times;</a>

{{_i}}Alternatively, you may use a <button> element with the data attribute, which we have opted to do for our docs. When using <button>, you must include type="button" or your forms may not submit.{{/i}}

- 
<button type="button" class="close" data-dismiss="alert">×</button>
+ 
<button type="button" class="close" data-dismiss="alert">&times;</button>

{{_i}}Dismiss alerts via JavaScript{{/i}}

{{_i}}Use the alerts jQuery plugin for quick and easy dismissal of alerts.{{/i}}

@@ -2027,7 +2027,7 @@ 
 <div class="alert alert-block">
-  <button type="button" class="close" data-dismiss="alert">×</button>
+  <button type="button" class="close" data-dismiss="alert">&times;</button>
   <h4>{{_i}}Warning!{{/i}}</h4>
   {{_i}}Best check yo self, you're not...{{/i}}
 </div>
-- 
cgit v1.2.3


From be45a821bb3387cac0944d80f7569b912cc21483 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 7 Dec 2012 09:51:01 -0800
Subject: Fixes #6148: Icons in mini buttons properly aligned

---
 docs/templates/pages/base-css.mustache | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'docs/templates')

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 9dcb7127b..6136d0095 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -2015,23 +2015,18 @@
 </div>
-
{{_i}}Large button{{/i}}
+
{{_i}}Button sizes{{/i}}
Star + Star + Star
{{! /bs-docs-example }} 
 <a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a>
+<a class="btn btn-small" href="#"><i class="icon-star"></i> Star</a>
+<a class="btn btn-mini" href="#"><i class="icon-star"></i> Star</a>
-
{{_i}}Small button{{/i}}
-
- -
{{! /bs-docs-example }} -
-<a class="btn btn-small" href="#"><i class="icon-star"></i></a>
-
- -

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

-- cgit v1.2.3 From a7eb9c294a575b5471ddec45ae75e1d09f7ace4c Mon Sep 17 00:00:00 2001 From: fat Date: Fri, 7 Dec 2012 17:06:01 -0500 Subject: add noConflict functionality to all bootstrap plugins --- docs/templates/pages/javascript.mustache | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 22aaafd93..33d788e4d 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -63,6 +63,14 @@ $("#myModal").modal('show') // initializes and invokes show immed

{{_i}}Each plugin also exposes its raw constructor on a `Constructor` property: $.fn.popover.Constructor. If you'd like to get a particular plugin instance, retrieve it directly from an element: $('[rel=popover]').data('popover').{{/i}}

+

{{_i}}No Conflict{{/i}}

+

{{_i}}Sometimes it's neccessary to use bootstrap plugins with other ui frameworks. In these circumstances, occasionally namespace collisions can occur. If this happens, you may call .noCoflict on the plugin you wish to revert the value of.{{/i}}

+ +
+var bootstrapButton = $.fn.button.noConflict() // return $.fn.button to previously assigned value
+$.fn.bootstrapBtn = bootstrapButton            // give $().bootstrapBtn the bootstrap functionality
+
+

{{_i}}Events{{/i}}

{{_i}}Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. show) is triggered at the start of an event, and its past participle form (ex. shown) is trigger on the completion of an action.{{/i}}

{{_i}}All infinitive events provide preventDefault functionality. This provides the ability to stop the execution of an action before it starts.{{/i}}

-- cgit v1.2.3 From 3bd9a26c01d6740d0b3a7aaad94ac53df3920c8c Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Sat, 8 Dec 2012 12:06:46 -0800 Subject: Apply code tag to data attribute on javascript page --- docs/templates/pages/javascript.mustache | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 33d788e4d..2fb2020c0 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1062,7 +1062,7 @@ $('#my-alert').bind('closed', function () {

{{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}

{{_i}}Stateful{{/i}}

-

{{_i}}Add data-loading-text="Loading..." to use a loading state on a button.{{/i}}

+

{{_i}}Add data-loading-text="Loading..." to use a loading state on a button.{{/i}}

{{! /example }} 
<button type="button" class="btn btn-primary" data-toggle="button">Single Toggle</button>

{{_i}}Checkbox{{/i}}

-

{{_i}}Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group.{{/i}}

+

{{_i}}Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group.{{/i}}

@@ -1095,7 +1095,7 @@ $('#my-alert').bind('closed', function () {

{{_i}}Radio{{/i}}

-

{{_i}}Add data-toggle="buttons-radio" for radio style toggling on btn-group.{{/i}}

+

{{_i}}Add data-toggle="buttons-radio" for radio style toggling on btn-group.{{/i}}

-- cgit v1.2.3