mirror of https://github.com/twbs/bootstrap.git
				
				
				
			New text align class, .text-nowrap, for preventing text from breaking to new lines. Applies it to the grid docs table.
This commit is contained in:
		
							parent
							
								
									e8100c3b3c
								
							
						
					
					
						commit
						dcbe484a09
					
				| 
						 | 
				
			
			@ -1135,6 +1135,9 @@ mark,
 | 
			
		|||
.text-justify {
 | 
			
		||||
  text-align: justify;
 | 
			
		||||
}
 | 
			
		||||
.text-nowrap {
 | 
			
		||||
  white-space: nowrap;
 | 
			
		||||
}
 | 
			
		||||
.text-muted {
 | 
			
		||||
  color: #999;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| 
						 | 
				
			
			@ -68,49 +68,49 @@
 | 
			
		|||
      </thead>
 | 
			
		||||
      <tbody>
 | 
			
		||||
        <tr>
 | 
			
		||||
          <th>Grid behavior</th>
 | 
			
		||||
          <th class="text-nowrap">Grid behavior</th>
 | 
			
		||||
          <td>Horizontal at all times</td>
 | 
			
		||||
          <td colspan="3">Collapsed to start, horizontal above breakpoints</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
          <th>Container width</th>
 | 
			
		||||
          <th class="text-nowrap">Container width</th>
 | 
			
		||||
          <td>None (auto)</td>
 | 
			
		||||
          <td>750px</td>
 | 
			
		||||
          <td>970px</td>
 | 
			
		||||
          <td>1170px</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
          <th>Class prefix</th>
 | 
			
		||||
          <th class="text-nowrap">Class prefix</th>
 | 
			
		||||
          <td><code>.col-xs-</code></td>
 | 
			
		||||
          <td><code>.col-sm-</code></td>
 | 
			
		||||
          <td><code>.col-md-</code></td>
 | 
			
		||||
          <td><code>.col-lg-</code></td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
          <th># of columns</th>
 | 
			
		||||
          <th class="text-nowrap"># of columns</th>
 | 
			
		||||
          <td colspan="4">12</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
          <th>Column width</th>
 | 
			
		||||
          <th class="text-nowrap">Column width</th>
 | 
			
		||||
          <td class="text-muted">Auto</td>
 | 
			
		||||
          <td>~62px</td>
 | 
			
		||||
          <td>~81px</td>
 | 
			
		||||
          <td>~97px</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
          <th>Gutter width</th>
 | 
			
		||||
          <th class="text-nowrap">Gutter width</th>
 | 
			
		||||
          <td colspan="4">30px (15px on each side of a column)</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
          <th>Nestable</th>
 | 
			
		||||
          <th class="text-nowrap">Nestable</th>
 | 
			
		||||
          <td colspan="4">Yes</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
          <th>Offsets</th>
 | 
			
		||||
          <th class="text-nowrap">Offsets</th>
 | 
			
		||||
          <td colspan="4">Yes</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
          <th>Column ordering</th>
 | 
			
		||||
          <th class="text-nowrap">Column ordering</th>
 | 
			
		||||
          <td colspan="4">Yes</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
      </tbody>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -195,12 +195,13 @@ You can use the mark tag to <mark>highlight</mark> text.
 | 
			
		|||
    <p class="text-center">Center aligned text.</p>
 | 
			
		||||
    <p class="text-right">Right aligned text.</p>
 | 
			
		||||
    <p class="text-justify">Justified text.</p>
 | 
			
		||||
    <p class="text-nowrap">No wrap text.</p>
 | 
			
		||||
  </div>
 | 
			
		||||
{% highlight html %}
 | 
			
		||||
<p class="text-left">Left aligned text.</p>
 | 
			
		||||
<p class="text-center">Center aligned text.</p>
 | 
			
		||||
<p class="text-right">Right aligned text.</p>
 | 
			
		||||
<p class="text-justify">Justified text.</p>
 | 
			
		||||
<p class="text-nowrap">No wrap text.</p>
 | 
			
		||||
{% endhighlight %}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| 
						 | 
				
			
			@ -96,6 +96,7 @@ mark,
 | 
			
		|||
.text-right          { text-align: right; }
 | 
			
		||||
.text-center         { text-align: center; }
 | 
			
		||||
.text-justify        { text-align: justify; }
 | 
			
		||||
.text-nowrap         { white-space: nowrap; }
 | 
			
		||||
 | 
			
		||||
// Contextual colors
 | 
			
		||||
.text-muted {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue