From 6d3086b7720814bcd50e37c2126ae9d7b7cb0ade Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 30 Jun 2014 21:11:21 -0700 Subject: [PATCH] regenerate with fixes applied --- css/index.html | 6 ++++++ examples/signin/index.html | 8 +++++--- javascript/index.html | 24 ++++++++++++------------ sitemap.xml | 18 +++++++++--------- 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/css/index.html b/css/index.html index dcfde4dddb..16440f9bc5 100644 --- a/css/index.html +++ b/css/index.html @@ -1672,6 +1672,12 @@ <label class="sr-only" for="exampleInputEmail2">Email address</label> <input type="email" class="form-control" id="exampleInputEmail2" placeholder="Enter email"> </div> + <div class="form-group"> + <div class="input-group"> + <div class="input-group-addon">@</div> + <input class="form-control" type="email" placeholder="Enter email"> + </div> + </div> <div class="form-group"> <label class="sr-only" for="exampleInputPassword2">Password</label> <input type="password" class="form-control" id="exampleInputPassword2" placeholder="Password"> diff --git a/examples/signin/index.html b/examples/signin/index.html index c9d2293a00..f25bedad79 100644 --- a/examples/signin/index.html +++ b/examples/signin/index.html @@ -38,9 +38,11 @@

Please sign in

- +
+ +
diff --git a/javascript/index.html b/javascript/index.html index f06068a813..21429d6f98 100644 --- a/javascript/index.html +++ b/javascript/index.html @@ -241,7 +241,7 @@
- +

Text in a modal

@@ -988,16 +988,16 @@

Multiple-line links

Sometimes you want to add a tooltip to a hyperlink that wraps multiple lines. The default behavior of the tooltip plugin is to center it horizontally and vertically. Add white-space: nowrap; to your anchors to avoid this.

-
 1 <!-- HTML to write -->
- 2 <a href="#" data-toggle="tooltip" title="Some tooltip text!">Hover over me</a>
- 3
- 4 <!-- Generated markup by the plugin -->
- 5 <div class="tooltip top" role="tooltip">
- 6   <div class="tooltip-arrow"></div>
- 7   <div class="tooltip-inner">
- 8     Some tooltip text!
- 9   </div>
-10 </div>
+
<!-- HTML to write -->
+<a href="#" data-toggle="tooltip" title="Some tooltip text!">Hover over me</a>
+
+<!-- Generated markup by the plugin -->
+<div class="tooltip top" role="tooltip">
+  <div class="tooltip-arrow"></div>
+  <div class="tooltip-inner">
+    Some tooltip text!
+  </div>
+</div>

Options

Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-, as in data-animation="".

@@ -1990,7 +1990,7 @@

Via data attributes

Use data attributes to easily control the position of the carousel. data-slide accepts the keywords prev or next, which alters the slide position relative to its current position. Alternatively, use data-slide-to to pass a raw slide index to the carousel data-slide-to="2", which shifts the slide position to a particular index beginning with 0.

-

The data-ride="carousel" attribute is used to mark a carousel as animating starting at page load.

+

The data-ride="carousel" attribute is used to mark a carousel as animating starting at page load. It cannot be used in combination with (redundant and unnecessary) explicit JavaScript initialization of the same carousel.

Via JavaScript

Call carousel manually with:

diff --git a/sitemap.xml b/sitemap.xml index 2e481b1c9a..22c1b51ac1 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -2,7 +2,7 @@ http://getbootstrap.com/ - 2014-06-26T09:35:48-07:00 + 2014-06-30T21:06:58-07:00 daily 1.0 @@ -10,7 +10,7 @@ http://getbootstrap.com/about/ - 2014-06-26T09:35:48-07:00 + 2014-06-30T21:06:58-07:00 weekly 0.7 @@ -19,7 +19,7 @@ http://getbootstrap.com/browser-bugs/ - 2014-06-26T09:35:48-07:00 + 2014-06-30T21:06:58-07:00 weekly 0.7 @@ -28,7 +28,7 @@ http://getbootstrap.com/components/ - 2014-06-26T09:35:48-07:00 + 2014-06-30T21:06:58-07:00 weekly 0.7 @@ -37,7 +37,7 @@ http://getbootstrap.com/css/ - 2014-06-26T09:35:48-07:00 + 2014-06-30T21:06:58-07:00 weekly 0.7 @@ -46,7 +46,7 @@ http://getbootstrap.com/customize/ - 2014-06-26T09:35:48-07:00 + 2014-06-30T21:06:58-07:00 weekly 0.7 @@ -55,7 +55,7 @@ http://getbootstrap.com/getting-started/ - 2014-06-26T09:35:48-07:00 + 2014-06-30T21:06:58-07:00 weekly 0.7 @@ -66,7 +66,7 @@ http://getbootstrap.com/javascript/ - 2014-06-26T09:35:48-07:00 + 2014-06-30T21:06:58-07:00 weekly 0.7 @@ -75,7 +75,7 @@ http://getbootstrap.com/migration/ - 2014-06-26T09:35:48-07:00 + 2014-06-30T21:06:58-07:00 weekly 0.7