diff options
| author | Mark Otto <[email protected]> | 2011-10-31 23:22:13 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-10-31 23:22:13 -0700 |
| commit | a21363a749f7d30a282e24cefd83840a5a3fca7c (patch) | |
| tree | c3dc61772359fdcbb75418bd105a61e3e5579f70 /lib | |
| parent | 98007b8394a5cf892694000d066a07a32f8c517f (diff) | |
| parent | 8f726dc6ef3ee725ef032ef4a11dbce26982ae24 (diff) | |
| download | bootstrap-a21363a749f7d30a282e24cefd83840a5a3fca7c.tar.xz bootstrap-a21363a749f7d30a282e24cefd83840a5a3fca7c.zip | |
Merge branch 'dev' of github.com:twitter/bootstrap into dev
Conflicts:
bootstrap.css
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/forms.less | 2 | ||||
| -rw-r--r-- | lib/patterns.less | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/forms.less b/lib/forms.less index eee1faad0..06bd5b3a5 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -255,7 +255,9 @@ textarea.xxlarge { // This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border .formColumns(@columnSpan: 1) { display: inline-block; + float: none; width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10; + margin-left: 0; } input, textarea { diff --git a/lib/patterns.less b/lib/patterns.less index 5f4192d89..307bfe4e6 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -573,7 +573,8 @@ footer { .transition(.1s linear all); // Active and Disabled states - &:active { + &.active, + :active { @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); } |