diff options
| author | Mark Otto <[email protected]> | 2012-01-30 00:43:57 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-30 00:43:57 -0800 |
| commit | 0f088af855908dc2e093772cfcf54c30893b952a (patch) | |
| tree | a13151ebb642eb5455aed2c4631fc97184218233 | |
| parent | ae7f94eeff733584cbdc80a2d13a85f136a7744e (diff) | |
| parent | 734bfe7f78574477a264f5ed430dc266d29f38f4 (diff) | |
| download | bootstrap-0f088af855908dc2e093772cfcf54c30893b952a.tar.xz bootstrap-0f088af855908dc2e093772cfcf54c30893b952a.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/bootstrap.zip
less/responsive.less
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 51780 -> 49734 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 9 | ||||
| -rw-r--r-- | js/bootstrap-collapse.js | 2 | ||||
| -rw-r--r-- | less/responsive.less | 10 |
4 files changed, 20 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex f42b5b57b..75d6f207e 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index fb1d62692..da6440bd2 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1,3 +1,12 @@ +/*! + * Bootstrap Responsive v2.0.0 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ .hidden { display: none; visibility: hidden; diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index ee36840d2..8134cc42f 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -71,7 +71,7 @@ this.$element .removeClass('collapse') - [dimension](size || '') + [dimension](size || 'auto') [0].offsetWidth this.$element.addClass('collapse') diff --git a/less/responsive.less b/less/responsive.less index 72fa21384..2ec57b478 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -1,3 +1,13 @@ +/*! + * Bootstrap Responsive v2.0.0 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ + // Responsive.less // For phone and tablet devices // ------------------------------------------------------------- |