From 8482cc4cb3632bbdf24aacb9793b90606e789c74 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Feb 2012 14:55:07 -0800 Subject: commit leftover from make --- docs/javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index 612724c79..9edc0e482 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1320,7 +1320,7 @@ $('#myCollapsible').on('hidden', function () {

.carousel(options)

Initializes the carousel with an optional options object and starts cycling through items.

-$('.myCarousel').carousel({
+$('.carousel').carousel({
   interval: 2000
 })
-- cgit v1.2.3 From 9b09d1de861b236ce27cbda8579d4ec1f6e4dd17 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Feb 2012 21:55:09 -0800 Subject: move overflow and max-height on modal to modal-body instead --- docs/javascript.html | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index 9edc0e482..2cb0c0938 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -237,6 +237,17 @@

Tooltips in a modal

This link and that link should have tooltips on hover.

+ +
+ +

Overflowing text to show optional scrollbar

+

We set a fixed max-height on the .modal-body. Watch it overflow with all this extra lorem ipsum text we've included.

+

Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.

+

Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.

+

Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.

+

Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.

+

Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.

+

Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.

Save changes -- cgit v1.2.3 From 0e8427e7b1c955a70a24817f6c06abd6dfa0c572 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 Feb 2012 22:38:54 -0800 Subject: update modal footers to use text-align instead of float on buttons for alignment --- docs/javascript.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index 2cb0c0938..74839da7d 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -214,8 +214,8 @@

One fine body…

- Save changes Close + Save changes
@@ -250,8 +250,8 @@

Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.

- Save changes Close + Save changes
Launch demo modal @@ -309,8 +309,8 @@ <p>One fine body…</p> </div> <div class="modal-footer"> - <a href="#" class="btn btn-primary">Save changes</a> <a href="#" class="btn">Close</a> + <a href="#" class="btn btn-primary">Save changes</a> </div> </div> -- cgit v1.2.3 From 74a3c763b47e146e354624cea56b73fbf514ad97 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 23 Feb 2012 16:24:33 -0800 Subject: add note about backdrop static --- docs/javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index 74839da7d..3d0f8ff07 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -276,7 +276,7 @@ backdrop boolean true - Includes a modal-backdrop element + Includes a modal-backdrop element. Alternatively, specify static for a backdrop which doesn't close the modal on click. keyboard -- cgit v1.2.3 From be9ae7006033f2be11f3547f30425417830158ba Mon Sep 17 00:00:00 2001 From: meleyal Date: Sat, 25 Feb 2012 01:25:31 +0100 Subject: Fix typos and clarify wording in carousel docs --- docs/javascript.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index 612724c79..3ec360acf 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1302,7 +1302,7 @@ $('#myCollapsible').on('hidden', function () {

Markup

-

Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.

+

Data attributes are used for the previous and next conrols. Check out the example markup below.

 <div id="myCarousel" class="carousel">
   <!-- Carousel items -->
@@ -1335,7 +1335,7 @@ $('.myCarousel').carousel({
           
.carousel('next')

           
Cycles to the next item.

           
Events

-          
Bootstrap's modal class exposes a few events for hooking into modal functionality.

+          
Bootstrap's carousel class exposes two events for hooking into carousel functionality.

           
-- 
cgit v1.2.3


From 6abb2059eb44b53c78bd61c72ad6eb3a83c70457 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 24 Feb 2012 21:06:17 -0800
Subject: fix docs example in js page per #2225

---
 docs/javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 74839da7d..1e1accb89 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -475,7 +475,7 @@ $('#myModal').on('hidden', function () {
           
 
 
-<ul class="nav pills">
+<ul class="nav nav-pills">
   <li class="active"><a href="#">Regular link</a></li>
   <li class="dropdown" id="menu1">
     <a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
-- 
cgit v1.2.3


From fb74018ae293588db84c6fbf2f4f07aa4da21c5e Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Fri, 24 Feb 2012 21:51:39 -0800
Subject: and pause on hover option to carousel

---
 docs/javascript.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 3d0f8ff07..3d99199a7 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1310,6 +1310,12 @@ $('#myCollapsible').on('hidden', function () {
                

+             
+               
+               
+               
+               
+             

             
              
5000
                The amount of time to delay between automatically cycling an item.
              
pausestring"hover"Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.

             
           

           
Markup

-- 
cgit v1.2.3


From d57598827f804f75b1eb12fc7098b58f152830ea Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 27 Feb 2012 19:40:07 -0800
Subject: fix typo in js docs carousel section per #2299

---
 docs/javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index c64a85b53..8f1d160ca 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1352,7 +1352,7 @@ $('.carousel').carousel({
           
.carousel('next')

           
Cycles to the next item.

           
Events

-          
Bootstrap's modal class exposes a few events for hooking into modal functionality.

+          
Bootstrap's carousel class exposes a few events for hooking into carousel functionality.

           
-- 
cgit v1.2.3