mirror of https://github.com/twbs/bootstrap.git
				
				
				
			fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas
This commit is contained in:
		
							parent
							
								
									e5187e12c4
								
							
						
					
					
						commit
						78790da03c
					
				| 
						 | 
				
			
			@ -169,11 +169,15 @@
 | 
			
		|||
  }
 | 
			
		||||
  [class*="span"],
 | 
			
		||||
  .row-fluid [class*="span"] {
 | 
			
		||||
    display: inline-block;
 | 
			
		||||
    display: block;
 | 
			
		||||
    float: none;
 | 
			
		||||
    width: auto;
 | 
			
		||||
    margin-left: 0;
 | 
			
		||||
  }
 | 
			
		||||
  .row-fluid .input-prepend [class*="span"],
 | 
			
		||||
  .row-fluid .input-append [class*="span"] {
 | 
			
		||||
    display: inline-block;
 | 
			
		||||
  }
 | 
			
		||||
  .input-large,
 | 
			
		||||
  .input-xlarge,
 | 
			
		||||
  .input-xxlarge,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -802,6 +802,10 @@ textarea {
 | 
			
		|||
  width: 210px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
textarea {
 | 
			
		||||
  height: auto;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
textarea,
 | 
			
		||||
input[type="text"],
 | 
			
		||||
input[type="password"],
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -94,6 +94,10 @@ input,
 | 
			
		|||
textarea {
 | 
			
		||||
  width: 210px;
 | 
			
		||||
}
 | 
			
		||||
// Reset height since textareas have rows
 | 
			
		||||
textarea {
 | 
			
		||||
  height: auto;
 | 
			
		||||
}
 | 
			
		||||
// Everything else
 | 
			
		||||
textarea,
 | 
			
		||||
input[type="text"],
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -120,10 +120,14 @@
 | 
			
		|||
  [class*="span"],
 | 
			
		||||
  .row-fluid [class*="span"] {
 | 
			
		||||
    float: none;
 | 
			
		||||
    display: inline-block;
 | 
			
		||||
    display: block;
 | 
			
		||||
    width: auto;
 | 
			
		||||
    margin-left: 0;
 | 
			
		||||
  }
 | 
			
		||||
  .row-fluid .input-prepend [class*="span"],
 | 
			
		||||
  .row-fluid .input-append [class*="span"] {
 | 
			
		||||
    display: inline-block;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // FORM FIELDS
 | 
			
		||||
  // -----------
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue