comparison static/bootstrap/less/forms.less @ 88:a5a3d454eac9

Updated Bootstrap.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 05 Apr 2013 08:08:12 -0700
parents 130eccd396d8
children d29e2f337b00
comparison
equal deleted inserted replaced
87:c0cf67362fb1 88:a5a3d454eac9
420 // ------------ 420 // ------------
421 421
422 // Allow us to put symbols and text within the input field for a cleaner look 422 // Allow us to put symbols and text within the input field for a cleaner look
423 .input-append, 423 .input-append,
424 .input-prepend { 424 .input-prepend {
425 margin-bottom: 5px; 425 display: inline-block;
426 margin-bottom: @baseLineHeight / 2;
427 vertical-align: middle;
426 font-size: 0; // white space collapse hack 428 font-size: 0; // white space collapse hack
427 white-space: nowrap; // Prevent span and input from separating 429 white-space: nowrap; // Prevent span and input from separating
428 430
429 // Reset the white space collapse hack 431 // Reset the white space collapse hack
430 input, 432 input,
431 select, 433 select,
432 .uneditable-input, 434 .uneditable-input,
433 .dropdown-menu { 435 .dropdown-menu,
436 .popover {
434 font-size: @baseFontSize; 437 font-size: @baseFontSize;
435 } 438 }
436 439
437 input, 440 input,
438 select, 441 select,