diff options
| author | fat <[email protected]> | 2013-07-26 00:22:48 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-07-26 00:22:48 -0700 |
| commit | 995add132efdb6557f191f1a65097f19260a4f7d (patch) | |
| tree | 9ae13f052b9896e211dbbc9dc97926875f39c7d4 /css.html | |
| parent | 91b6a43ed934931ccfdb11213a3b63984457b07c (diff) | |
| parent | 210ee6369313b311b879cf1a773ecfd0276f3543 (diff) | |
| download | bootstrap-995add132efdb6557f191f1a65097f19260a4f7d.tar.xz bootstrap-995add132efdb6557f191f1a65097f19260a4f7d.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'css.html')
| -rw-r--r-- | css.html | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -539,15 +539,19 @@ lead: "Global CSS settings, fundamental HTML elements styled and enhanced with e <p>Convey meaning through color with a handful of emphasis utility classes.</p> <div class="bs-example"> <p class="text-muted">Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.</p> + <p class="text-primary">Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p class="text-warning">Etiam porta sem malesuada magna mollis euismod.</p> <p class="text-danger">Donec ullamcorper nulla non metus auctor fringilla.</p> <p class="text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p> + <p class="text-info">Maecenas sed diam eget risus varius blandit sit amet non magna.</p> </div> {% highlight html %} <p class="text-muted">...</p> +<p class="text-primary">...</p> <p class="text-warning">...</p> <p class="text-danger">...</p> <p class="text-success">...</p> +<p class="text-info">...</p> {% endhighlight %} |
