mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-03-27 09:40:23 +00: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:
commit
0f088af855
4 changed files with 20 additions and 1 deletions
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 {
|
||||
display: none;
|
||||
visibility: hidden;
|
||||
|
|
|
|||
2
js/bootstrap-collapse.js
vendored
2
js/bootstrap-collapse.js
vendored
|
|
@ -71,7 +71,7 @@
|
|||
|
||||
this.$element
|
||||
.removeClass('collapse')
|
||||
[dimension](size || '')
|
||||
[dimension](size || 'auto')
|
||||
[0].offsetWidth
|
||||
|
||||
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
|
||||
// For phone and tablet devices
|
||||
// -------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue