2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00

Merge branch 'js-examples' into 1.3-wip

Conflicts:
	bootstrap-1.2.0.css
This commit is contained in:
Jacob Thornton
2011-09-02 21:06:49 -07:00
16 changed files with 1142 additions and 115 deletions
+7
View File
@@ -95,6 +95,13 @@ body {
}
}
.hide {
display: none;
}
.show {
display: block;
}
// BASE STYLES
// -----------