diff options
| author | Mark Otto <[email protected]> | 2013-05-14 23:28:09 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-14 23:28:09 -0700 |
| commit | 31dcb911893c1f7b6eebe097705a3e64568c8654 (patch) | |
| tree | d07fc6a206ef5e9377a6b80ad1d62a01112868bd /docs/assets | |
| parent | fcb7c9da6f5082e1306fab096c16020b4227c967 (diff) | |
| parent | 57856e6cfb21022035d8611607b15eb3a0cef76a (diff) | |
| download | bootstrap-31dcb911893c1f7b6eebe097705a3e64568c8654.tar.xz bootstrap-31dcb911893c1f7b6eebe097705a3e64568c8654.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
docs/assets/css/docs.css
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/css/docs.css | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7f2526f21..c2446d0fe 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -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; } |