mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Code Activity

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

Browse Source 
Conflicts:
	docs/assets/css/docs.css
This commit is contained in:
Mark Otto
2013-05-14 23:28:09 -07:00
parent fcb7c9da6f 57856e6cfb
commit 31dcb91189
3 changed files with 27 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+5
View File
@@ -295,6 +295,11 @@ body {
}
/* Forms */
.bs-example.form-inline select,
.bs-example.form-inline input[type="text"],
.bs-example.form-inline input[type="password"] {
width: 180px;
}
.bs-example-control-sizing input[type="text"] + input[type="text"] {
margin-top: 10px;
}