diff options
| author | Mark Otto <[email protected]> | 2011-11-29 22:35:58 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-11-29 22:35:58 -0800 |
| commit | cbb291b8ab316c3c0103da3c7b7a2c73596cfef2 (patch) | |
| tree | e632dc37d1f3dda4e91a06d4f671313a7e476187 /lib/patterns.less | |
| parent | b36df463108e2e4df8c389a06f577823564788d9 (diff) | |
| parent | 08d0aff19f8ad8fa2a9cfa389b8753c4525ea99c (diff) | |
| download | bootstrap-cbb291b8ab316c3c0103da3c7b7a2c73596cfef2.tar.xz bootstrap-cbb291b8ab316c3c0103da3c7b7a2c73596cfef2.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
bootstrap.min.css
Diffstat (limited to 'lib/patterns.less')
| -rw-r--r-- | lib/patterns.less | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index 2fcc4f2b3..15c3c9c06 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -1,6 +1,6 @@ -/* Patterns.less - * Repeatable UI elements outside the base styles provided from the scaffolding - * ---------------------------------------------------------------------------- */ +// Patterns.less +// Repeatable UI elements outside the base styles provided from the scaffolding +// ---------------------------------------------------------------------------- // NAVBAR (FIXED AND STATIC) @@ -415,6 +415,7 @@ footer { .transition(.1s linear all); // Active and Disabled states + &.active, &:active { @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); @@ -630,14 +631,6 @@ input[type=submit].btn { } - - - - - - - - // PATTERN ANIMATIONS // ------------------ @@ -649,6 +642,14 @@ input[type=submit].btn { } } +.collapse { + .transition(height .35s ease); + position:relative; + overflow:hidden; + height: 0; + &.in { height: auto; } +} + // LABELS // ------ |