diff options
| author | Mark Otto <[email protected]> | 2013-12-01 20:27:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-01 20:27:30 -0800 |
| commit | 4876cbeef8c79686ba31c3ed22771357d71dbe51 (patch) | |
| tree | 79fed0fbb2a96fad2247c3014a045e655d1a825e /less/input-groups.less | |
| parent | 1444a3ca638bd8661c0019560117ac75aace3402 (diff) | |
| parent | 561aff7942d9adfc9508232789e2598406f80934 (diff) | |
| download | bootstrap-4876cbeef8c79686ba31c3ed22771357d71dbe51.tar.xz bootstrap-4876cbeef8c79686ba31c3ed22771357d71dbe51.zip | |
Merge branch 'master' into pr/11412
Conflicts:
dist/js/bootstrap.min.js
Diffstat (limited to 'less/input-groups.less')
| -rw-r--r-- | less/input-groups.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/less/input-groups.less b/less/input-groups.less index 8516a79e9..d19c4c64a 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -10,7 +10,7 @@ border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table // Undo padding and float of grid classes - &.col { + &[class*="col-"] { float: none; padding-left: 0; padding-right: 0; |