Skip to content

Commit 7875e48

Browse files
mdomdo
committed
fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing
1 parent f53a038 commit 7875e48

File tree

5 files changed

+65
-32
lines changed

5 files changed

+65
-32
lines changed

‎docs/assets/css/bootstrap-responsive.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,6 @@
174174
width: auto;
175175
margin-left: 0;
176176
}
177-
.row-fluid .input-prepend [class*="span"],
178-
.row-fluid .input-append [class*="span"] {
179-
display: inline-block;
180-
}
181177
.input-large,
182178
.input-xlarge,
183179
.input-xxlarge,

‎docs/assets/css/bootstrap.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,15 @@ textarea[class*="span"],
982982
margin-left: 0;
983983
}
984984

985+
.input-append input[class*="span"],
986+
.input-append .uneditable-input[class*="span"],
987+
.input-prepend input[class*="span"],
988+
.input-prepend .uneditable-input[class*="span"],
989+
.row-fluid .input-prepend [class*="span"],
990+
.row-fluid .input-append [class*="span"] {
991+
display: inline-block;
992+
}
993+
985994
input,
986995
textarea,
987996
.uneditable-input {

‎less/forms.less

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,15 @@ textarea[class*="span"],
245245
float: none;
246246
margin-left: 0;
247247
}
248+
// Ensure input-prepend/append never wraps
249+
.input-append input[class*="span"],
250+
.input-append .uneditable-input[class*="span"],
251+
.input-prepend input[class*="span"],
252+
.input-prepend .uneditable-input[class*="span"],
253+
.row-fluid .input-prepend [class*="span"],
254+
.row-fluid .input-append [class*="span"] {
255+
display: inline-block;
256+
}
248257

249258

250259

‎less/responsive-767px-max.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,6 @@
124124
width: auto;
125125
margin-left: 0;
126126
}
127-
.row-fluid .input-prepend [class*="span"],
128-
.row-fluid .input-append [class*="span"] {
129-
display: inline-block;
130-
}
131127

132128
// FORM FIELDS
133129
// -----------

‎less/tests/css-tests.html

Lines changed: 47 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -500,68 +500,91 @@ <h4>Prepend and append with uneditable</h4>
500500
</div><!--/span-->
501501
</div><!--/row-->
502502

503+
<h4>Fluid prepended and appended inputs</h4>
504+
<div class="row-fluid">
505+
<div class="span6">
506+
<form>
507+
<div class="controls">
508+
<div class="input-prepend">
509+
<span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text">
510+
</div>
511+
</div>
512+
<div class="controls">
513+
<div class="input-append">
514+
<input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">@</span>
515+
</div>
516+
</div>
517+
<div class="controls">
518+
<div class="input-prepend input-append">
519+
<span class="add-on">$</span><input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">.00</span>
520+
</div>
521+
</div>
522+
</form>
523+
</div>
524+
</div>
525+
503526
<h4>Fixed row with inputs</h4>
504527
<p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
505528

506529
<div class="rowInputs">
507530
<div class="row">
508531
<div class="span12">
509-
<input class="span1" placeholder="span1">
532+
<input type="text" class="span1" placeholder="span1">
510533
</div><!--/span-->
511534
</div><!--/row-->
512535
<div class="row">
513536
<div class="span12">
514-
<input class="span2" placeholder="span2">
537+
<input type="text" class="span2" placeholder="span2">
515538
</div><!--/span-->
516539
</div><!--/row-->
517540
<div class="row">
518541
<div class="span12">
519-
<input class="span3" placeholder="span3">
542+
<input type="text" class="span3" placeholder="span3">
520543
</div><!--/span-->
521544
</div><!--/row-->
522545
<div class="row">
523546
<div class="span12">
524-
<input class="span4" placeholder="span4">
547+
<input type="text" class="span4" placeholder="span4">
525548
</div><!--/span-->
526549
</div><!--/row-->
527550
<div class="row">
528551
<div class="span12">
529-
<input class="span5" placeholder="span5">
552+
<input type="text" class="span5" placeholder="span5">
530553
</div><!--/span-->
531554
</div><!--/row-->
532555
<div class="row">
533556
<div class="span12">
534-
<input class="span6" placeholder="span6">
557+
<input type="text" class="span6" placeholder="span6">
535558
</div><!--/span-->
536559
</div><!--/row-->
537560
<div class="row">
538561
<div class="span12">
539-
<input class="span7" placeholder="span7">
562+
<input type="text" class="span7" placeholder="span7">
540563
</div><!--/span-->
541564
</div><!--/row-->
542565
<div class="row">
543566
<div class="span12">
544-
<input class="span8" placeholder="span8">
567+
<input type="text" class="span8" placeholder="span8">
545568
</div><!--/span-->
546569
</div><!--/row-->
547570
<div class="row">
548571
<div class="span12">
549-
<input class="span9" placeholder="span9">
572+
<input type="text" class="span9" placeholder="span9">
550573
</div><!--/span-->
551574
</div><!--/row-->
552575
<div class="row">
553576
<div class="span12">
554-
<input class="span10" placeholder="span10">
577+
<input type="text" class="span10" placeholder="span10">
555578
</div><!--/span-->
556579
</div><!--/row-->
557580
<div class="row">
558581
<div class="span12">
559-
<input class="span11" placeholder="span11">
582+
<input type="text" class="span11" placeholder="span11">
560583
</div><!--/span-->
561584
</div><!--/row-->
562585
<div class="row">
563586
<div class="span12">
564-
<input class="span12" placeholder="span12">
587+
<input type="text" class="span12" placeholder="span12">
565588
</div><!--/span-->
566589
</div><!--/row-->
567590
</div>
@@ -572,62 +595,62 @@ <h4>Fluid row with inputs</h4>
572595
<div id="fluidRowInputs">
573596
<div class="row-fluid">
574597
<div class="span12">
575-
<input class="span1" placeholder="span1">
598+
<input type="text" class="span1" placeholder="span1">
576599
</div><!--/span-->
577600
</div><!--/row-->
578601
<div class="row-fluid">
579602
<div class="span12">
580-
<input class="span2" placeholder="span2">
603+
<input type="text" class="span2" placeholder="span2">
581604
</div><!--/span-->
582605
</div><!--/row-->
583606
<div class="row-fluid">
584607
<div class="span12">
585-
<input class="span3" placeholder="span3">
608+
<input type="text" class="span3" placeholder="span3">
586609
</div><!--/span-->
587610
</div><!--/row-->
588611
<div class="row-fluid">
589612
<div class="span12">
590-
<input class="span4" placeholder="span4">
613+
<input type="text" class="span4" placeholder="span4">
591614
</div><!--/span-->
592615
</div><!--/row-->
593616
<div class="row-fluid">
594617
<div class="span12">
595-
<input class="span5" placeholder="span5">
618+
<input type="text" class="span5" placeholder="span5">
596619
</div><!--/span-->
597620
</div><!--/row-->
598621
<div class="row-fluid">
599622
<div class="span12">
600-
<input class="span6" placeholder="span6">
623+
<input type="text" class="span6" placeholder="span6">
601624
</div><!--/span-->
602625
</div><!--/row-->
603626
<div class="row-fluid">
604627
<div class="span12">
605-
<input class="span7" placeholder="span7">
628+
<input type="text" class="span7" placeholder="span7">
606629
</div><!--/span-->
607630
</div><!--/row-->
608631
<div class="row-fluid">
609632
<div class="span12">
610-
<input class="span8" placeholder="span8">
633+
<input type="text" class="span8" placeholder="span8">
611634
</div><!--/span-->
612635
</div><!--/row-->
613636
<div class="row-fluid">
614637
<div class="span12">
615-
<input class="span9" placeholder="span9">
638+
<input type="text" class="span9" placeholder="span9">
616639
</div><!--/span-->
617640
</div><!--/row-->
618641
<div class="row-fluid">
619642
<div class="span12">
620-
<input class="span10" placeholder="span10">
643+
<input type="text" class="span10" placeholder="span10">
621644
</div><!--/span-->
622645
</div><!--/row-->
623646
<div class="row-fluid">
624647
<div class="span12">
625-
<input class="span11" placeholder="span11">
648+
<input type="text" class="span11" placeholder="span11">
626649
</div><!--/span-->
627650
</div><!--/row-->
628651
<div class="row-fluid">
629652
<div class="span12">
630-
<input class="span12" placeholder="span12">
653+
<input type="text" class="span12" placeholder="span12">
631654
</div><!--/span-->
632655
</div><!--/row-->
633656
</div>

0 commit comments

Comments
 (0)