diff options
| author | Mark Otto <[email protected]> | 2014-01-11 19:13:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-11 19:13:10 -0800 |
| commit | bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80 (patch) | |
| tree | dbeab5560ca6760fa65e9f342c517dcbe56475f9 /less | |
| parent | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (diff) | |
| parent | 80c9c14ab956459f07a7f1de8693a2ab693bcb51 (diff) | |
| download | bootstrap-bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80.tar.xz bootstrap-bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/getting-started.html
Diffstat (limited to 'less')
| -rw-r--r-- | less/forms.less | 4 | ||||
| -rw-r--r-- | less/panels.less | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/less/forms.less b/less/forms.less index 0f592252a..6b475ae13 100644 --- a/less/forms.less +++ b/less/forms.less @@ -47,7 +47,7 @@ input[type="checkbox"] { line-height: normal; } -// Set the height of select and file controls to match text inputs +// Set the height of file controls to match text inputs input[type="file"] { display: block; } @@ -71,7 +71,7 @@ select optgroup { font-family: inherit; } -// Focus for select, file, radio, and checkbox +// Focus for file, radio, and checkbox input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { diff --git a/less/panels.less b/less/panels.less index bf2cb768a..a19fa3788 100644 --- a/less/panels.less +++ b/less/panels.less @@ -150,6 +150,8 @@ // the help of our collapse JavaScript plugin. .panel-group { + margin-bottom: @line-height-computed; + // Tighten up margin so it's only between panels .panel { margin-bottom: 0; |