diff options
| author | Jacob Thornton <[email protected]> | 2012-04-04 15:13:27 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-04 15:13:27 -0700 |
| commit | 4953629ccd0a1c43ae483a843db6d882fe66fc03 (patch) | |
| tree | 22420388e754c7ed67fdb7256cefe62023a0ca08 /less/forms.less | |
| parent | 83febb3452ecd81241ddc004509ec64de8b13a92 (diff) | |
| parent | 2ea437f353a636a277320513db04ced4fc0f7da2 (diff) | |
| download | bootstrap-4953629ccd0a1c43ae483a843db6d882fe66fc03.tar.xz bootstrap-4953629ccd0a1c43ae483a843db6d882fe66fc03.zip | |
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'less/forms.less')
| -rw-r--r-- | less/forms.less | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/less/forms.less b/less/forms.less index a57732c13..240de5ed2 100644 --- a/less/forms.less +++ b/less/forms.less @@ -213,9 +213,7 @@ textarea { input:focus, textarea:focus { border-color: rgba(82,168,236,.8); - @shadow: inset 0 1px 1px rgba(0,0,0,.075), - 0 0 8px rgba(82,168,236,.6); - .box-shadow(@shadow); + .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)"); outline: 0; outline: thin dotted \9; /* IE6-9 */ } @@ -244,7 +242,12 @@ select:focus { input[class*="span"], select[class*="span"], textarea[class*="span"], -.uneditable-input[class*="span"] { +.uneditable-input[class*="span"], +// Redeclare since the fluid row class is more specific +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"] { float: none; margin-left: 0; } |