mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Merge branch '2.1.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less
This commit is contained in:
Mark Otto
2012-10-01 23:41:00 -07:00
parent e6d6c7a413 7c9597f4e7
commit 4ab7b77aa3
12 changed files with 1246 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/tables.less
-2
View File
@@ -178,8 +178,6 @@ table [class*=span] {
margin-left: 0; // undo default grid column styles
}
// TABLE BACKGROUNDS
// -----------------
// Exact selectors below required to override .table-striped