Skip to content

Commit

Permalink
Fixes #14221: Make .form-control-static work in inline forms as well
Browse files Browse the repository at this point in the history
  • Loading branch information
mdo committed Jul 24, 2014
1 parent abbb4d6 commit 078aafe
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 5 deletions.
6 changes: 6 additions & 0 deletions dist/css/bootstrap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/css/docs.min.css

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions docs/dist/css/bootstrap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/dist/css/bootstrap.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dist/css/bootstrap.min.css

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions less/forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,11 @@ input[type="checkbox"] {
vertical-align: middle;
}

// Make static controls behave like regular ones
.form-control-static {
display: inline-block;
}

.input-group {
display: inline-table;
vertical-align: middle;
Expand Down

0 comments on commit 078aafe

Please sign in to comment.