diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:46:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:46:40 -0800 |
| commit | 4c64c1eecdb52d943a50d2c181aeb915a3caed34 (patch) | |
| tree | 93b556ef583bb6a327cad76804bbdf4c5a4c6f4c /less/input-groups.less | |
| parent | 2b56ff04614c4617355d16c14784654e841bcf4d (diff) | |
| parent | d79431ca02683c9d1c754201260f66e5dda15614 (diff) | |
| download | bootstrap-4c64c1eecdb52d943a50d2c181aeb915a3caed34.tar.xz bootstrap-4c64c1eecdb52d943a50d2c181aeb915a3caed34.zip | |
Merge branch 'master' into pr/11302
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
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; |
