From: Jacob Thornton Date: Mon, 23 Jan 2012 23:06:56 +0000 (-0800) Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip X-Git-Tag: v2.0.0~6^2~241 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74521e835489066d58813c960bc98d1713ea6074;p=thirdparty%2Fbootstrap.git Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip Conflicts: bootstrap.css docs/base-css.html docs/components.html docs/index.html docs/javascript.html docs/less.html docs/scaffolding.html --- 74521e835489066d58813c960bc98d1713ea6074 diff --cc bootstrap.css index b911730eb4,91c4ca7012..2908ac2963 --- a/bootstrap.css +++ b/bootstrap.css @@@ -6,95 -6,8 +6,12 @@@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. ++<<<<<<< HEAD + * Date: Mon Jan 23 14:12:25 PST 2012 ++======= + * Date: Mon Jan 23 13:48:03 PST 2012 ++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 */ - html, body { - margin: 0; - padding: 0; - } - h1, - h2, - h3, - h4, - h5, - h6, - p, - blockquote, - pre, - a, - abbr, - acronym, - address, - cite, - code, - del, - dfn, - em, - img, - q, - s, - samp, - small, - strike, - strong, - sub, - sup, - tt, - var, - dd, - dl, - dt, - li, - ol, - ul, - fieldset, - form, - label, - legend, - button, - table, - caption, - tbody, - tfoot, - thead, - tr, - th, - td { - margin: 0; - padding: 0; - border: 0; - font-weight: normal; - font-style: normal; - font-size: 100%; - line-height: 1; - font-family: inherit; - } - table { - max-width: 100%; - border-collapse: collapse; - border-spacing: 0; - } - ol, ul { - list-style: none; - } - q:before, - q:after, - blockquote:before, - blockquote:after { - content: ""; - } - html { - overflow-y: scroll; - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; - } - a:focus { - outline: thin dotted; - } - a:hover, a:active { - outline: 0; - } article, aside, details, diff --cc docs/base-css.html index a3e8cc85a4,df0c9c7ce9..a869eecf87 --- a/docs/base-css.html +++ b/docs/base-css.html @@@ -34,72 -33,21 +34,79 @@@
Bootstrap
@@@ -108,12 -56,19 +115,28 @@@
++<<<<<<< HEAD + +
+

Base CSS

+

On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.

+
++======= + +
+

Base CSS

+

On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.

+ +
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 +
+

Components

+

Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

+
++======= + +
+

Components

+

Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

+ +
+ ++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 +
+

Javascript for Bootstrap

+

Bring Bootstrap's components to life—now with 12 custom jQuery plugins. +

+
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 + +
+

Javascript for Bootstrap

+

Bring Bootstrap's components to life—now with 12 custom jQuery plugins. +

- -
-
-

jQuery plugins A dozen Bootstrap plugins to get you started

-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
-
- Download Source - - - - + + +
+
+

jQuery plugins A dozen Bootstrap plugins to get you started

+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+ Select/Unselect All Plugins +

Note: All plugins require the latest version of jQuery to be included.

+
+ + + + +
+
+

Modals bootstrap-modal.js

+
+
+
+

About modals

+

A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.

+ Download file +
+
+

Static example

+

Below is a statically rendered modal.

+
+
+
+ × +

Modal header

+
+
+

One fine body…

+
+
+ Save changes + Close
-
-
- Select/Unselect All Plugins -

Note: All plugins require the latest version of jQuery to be included.

-
- +
+ +

Live demo

+

Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.

+ +