mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-19 11:51:23 +02:00
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts: docs/assets/bootstrap.zip less/responsive.less
This commit is contained in:
Binary file not shown.
9
docs/assets/css/bootstrap-responsive.css
vendored
9
docs/assets/css/bootstrap-responsive.css
vendored
@@ -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 {
|
.hidden {
|
||||||
display: none;
|
display: none;
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
|
2
js/bootstrap-collapse.js
vendored
2
js/bootstrap-collapse.js
vendored
@@ -71,7 +71,7 @@
|
|||||||
|
|
||||||
this.$element
|
this.$element
|
||||||
.removeClass('collapse')
|
.removeClass('collapse')
|
||||||
[dimension](size || '')
|
[dimension](size || 'auto')
|
||||||
[0].offsetWidth
|
[0].offsetWidth
|
||||||
|
|
||||||
this.$element.addClass('collapse')
|
this.$element.addClass('collapse')
|
||||||
|
@@ -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
|
// Responsive.less
|
||||||
// For phone and tablet devices
|
// For phone and tablet devices
|
||||||
// -------------------------------------------------------------
|
// -------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user