]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #13671 from 04818419/text-transformation
authorMark Otto <markdotto@gmail.com>
Wed, 11 Jun 2014 05:56:38 +0000 (22:56 -0700)
committerMark Otto <markdotto@gmail.com>
Wed, 11 Jun 2014 05:56:38 +0000 (22:56 -0700)
text transformation added

1  2 
docs/_includes/css/type.html
less/type.less

index 65001198d2e416f33228bee22ad675cba78c0023,57ee72b920504e835199d51b34d049b9e1853c65..124e4f087b0e899b7819d890a4b2533c55ce1c81
@@@ -201,9 -200,21 +201,21 @@@ You can use the mark tag to <mark>highl
  <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 %}
  
+   <h2 id="type-transformation">Transformation classes</h2>
+   <p>Transform text in components with text capitalization classes.</p>
+   <div class="bs-example">
+       <p class="text-lowercase">Lowercase text.</p>
+       <p class="text-uppercase">Uppercase text.</p>
+       <p class="text-capitalize">Capitalize text.</p>
+   </div>
+ {% highlight html %}
+ <p class="text-lowercase">Lowercase text.</p>
+ <p class="text-uppercase">Uppercase text.</p>
+ <p class="text-capitalize">Capitalize text.</p>
+ {% endhighlight %}
  
    <!-- Abbreviations -->
    <h2 id="type-abbreviations">Abbreviations</h2>
diff --cc less/type.less
index 101c81e729922508186a65457c0ea812f91a767e,d76298e578b58d92ce0bc8a1b74775af27381f9b..93414474aa5094d336bd512dffda699f6374b983
@@@ -96,8 -96,12 +96,13 @@@ mark
  .text-right          { text-align: right; }
  .text-center         { text-align: center; }
  .text-justify        { text-align: justify; }
 +.text-nowrap         { white-space: nowrap; }
  
+ // Transformation
+ .text-lowercase      { text-transform: lowercase; }
+ .text-uppercase      { text-transform: uppercase; }
+ .text-capitalize     { text-transform: capitalize; }
  // Contextual colors
  .text-muted {
    color: @text-muted;