diff options
| author | Jacob Thornton <[email protected]> | 2012-01-25 11:49:20 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-25 11:49:20 -0800 |
| commit | 3250ecc674306ab82f9379325e6eec0bb4ba6dd0 (patch) | |
| tree | 94b46667aa3e73bbabbae618e267359857c6c69c /lib | |
| parent | 319b65e64b6882ad2184f398f1763543cfa48a16 (diff) | |
| parent | 06017b26ca5a9c835edb9d42188431fa30c7e499 (diff) | |
| download | bootstrap-3250ecc674306ab82f9379325e6eec0bb4ba6dd0.tar.xz bootstrap-3250ecc674306ab82f9379325e6eec0bb4ba6dd0.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/carousel.less | 6 | ||||
| -rw-r--r-- | lib/forms.less | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/carousel.less b/lib/carousel.less index b0e95bfe9..254a9f60c 100644 --- a/lib/carousel.less +++ b/lib/carousel.less @@ -20,6 +20,12 @@ .transition(.6s ease-in-out left); } + // Account for jankitude on images + .item > img { + display: block; + line-height: 1; + } + .active, .next, .prev { display: block; } diff --git a/lib/forms.less b/lib/forms.less index 178c21018..3b35a172c 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -52,7 +52,7 @@ input, textarea, select, .uneditable-input { - display: block; + display: inline-block; width: 210px; height: @baseLineHeight; padding: 4px; @@ -283,6 +283,7 @@ textarea[readonly] { } // Style inputs accordingly input, + select, textarea { color: @textColor; border-color: @borderColor; |