mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00
Code Activity

Merge branch '2.2.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
This commit is contained in:
Mark Otto
2012-11-04 12:42:00 -08:00
parent 508cc1fef4 22d1506d23
commit 1af0021014
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
+2 -5
View File
@@ -544,12 +544,9 @@ li {
line-height: 20px;
}
.list-unstyled {
margin-left: 0;
list-style: none;
}
.list-unstyled,
.list-inline {
margin-left: 0;
list-style: none;
}