mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch 'master' into pr/11435

Browse Source 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-12-14 16:56:56 -08:00
parent aad447e290 4c64c1eecd
commit 46c3d27468
113 changed files with 5568 additions and 4893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/input-groups.less
+1 -1
View File
@@ -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;