2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00

Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into respclasses

This commit is contained in:
Roberto - phproberto
2012-07-11 01:31:44 +02:00
22 changed files with 8545 additions and 8410 deletions
+9
View File
@@ -362,6 +362,9 @@
.uneditable-input {
margin-left: 0;
}
.controls-row [class*="span"] + [class*="span"] {
margin-left: 30px;
}
input.span12,
textarea.span12,
.uneditable-input.span12 {
@@ -704,6 +707,9 @@
.uneditable-input {
margin-left: 0;
}
.controls-row [class*="span"] + [class*="span"] {
margin-left: 20px;
}
input.span12,
textarea.span12,
.uneditable-input.span12 {
@@ -798,6 +804,9 @@
.thumbnails {
margin-left: 0;
}
.thumbnails > li {
float: none;
}
[class*="span"],
.row-fluid [class*="span"] {
display: block;