2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
	bootstrap.css
	bootstrap.min.css
This commit is contained in:
Mark Otto
2011-11-29 22:35:58 -08:00
32 changed files with 1372 additions and 658 deletions
+5 -5
View File
@@ -1,7 +1,7 @@
/*
* Tables.less
* Tables for, you guessed it, tabular data
* ---------------------------------------- */
//
// Tables.less
// Tables for, you guessed it, tabular data
// ----------------------------------------
@@ -223,4 +223,4 @@ table {
.headerSortDown.purple {
background-color: lighten(@purple, 40%);
}
}*/
}*/