From fae04c8ac1da675338c1cfaf3922223980667281 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 29 Jan 2012 19:04:26 -0800 Subject: add license for responsive and rebuild --- docs/assets/bootstrap.zip | Bin 51339 -> 51502 bytes docs/assets/css/bootstrap-responsive.css | 9 +++++++++ less/responsive.less | 14 ++++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 099ed3b1a..dafd812dc 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 76e27d672..8fadecceb 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/less/responsive.less b/less/responsive.less index a1d4cf2c8..7f0892809 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 // ------------------------------------------------------------- @@ -203,7 +213,7 @@ .gridColumn() { float: left; margin-left: @gridGutterWidth; - } + } [class*="span"] { .gridColumn(); } @@ -436,7 +446,7 @@ .gridColumn() { float: left; margin-left: @gridGutterWidth; - } + } [class*="span"] { .gridColumn(); } -- cgit v1.2.3 From f9b53d424e55bca4c7efe6220d36acafaee613cd Mon Sep 17 00:00:00 2001 From: Mark Reeder Date: Sun, 29 Jan 2012 21:14:07 -0800 Subject: Fixes issue with Opera flickering on the collapse plugin when reset is called without specifying the size https://github.com/twitter/bootstrap/issues/1208 --- js/bootstrap-collapse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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') -- cgit v1.2.3