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

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

Browse Source 
Conflicts:
	bootstrap-1.2.0.css
This commit is contained in:
Jacob Thornton
2011-09-01 22:54:59 -07:00
parent 72da5dd54d 0cb6804b69
commit 0159524413
5 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/reset.less
-10
View File
@@ -133,14 +133,4 @@ input[type="search"]::-webkit-search-decoration {
textarea {
overflow: auto; // Remove vertical scrollbar in IE6-9
vertical-align: top; // Readability and alignment cross-browser
}
// Tables
// -------------------------
// Source: http://github.com/necolas/normalize.css
// Remove spacing between table cells
table {
border-collapse: collapse;
border-spacing: 0;
}
lib/scaffolding.less
+2 -2
View File
@@ -54,8 +54,8 @@
// Unique column sizes for 16-column grid
.span-one-third { width: 300px; }
.span-two-thirds { width: 620px; }
.offset-one-third { margin-left: 320px; }
.offset-two-thirds { margin-left: 640px; }
.offset-one-third { margin-left: 340px; }
.offset-two-thirds { margin-left: 660px; }
}