mirror of
https://github.com/twbs/bootstrap.git
synced 2024-11-28 10:24:19 +01:00
fixes #4909: add color utility classes .text-warning, etc and document them
This commit is contained in:
parent
69d4c3f9a1
commit
9d5f9eca85
16
docs/assets/css/bootstrap.css
vendored
16
docs/assets/css/bootstrap.css
vendored
@ -609,6 +609,22 @@ cite {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.text-warning {
|
||||
color: #c09853;
|
||||
}
|
||||
|
||||
.text-error {
|
||||
color: #b94a48;
|
||||
}
|
||||
|
||||
.text-info {
|
||||
color: #3a87ad;
|
||||
}
|
||||
|
||||
.text-success {
|
||||
color: #468847;
|
||||
}
|
||||
|
||||
h1,
|
||||
h2,
|
||||
h3,
|
||||
|
@ -154,14 +154,14 @@
|
||||
</p>
|
||||
</pre>
|
||||
|
||||
<h3><code><strong></code></h3>
|
||||
<h3>Bold</h3>
|
||||
<p>For emphasizing a snippet of text with <strong>important</strong></p>
|
||||
<div class="bs-docs-example">
|
||||
<p>The following snippet of text is <strong>rendered as bold text</strong>.</p>
|
||||
</div>
|
||||
<pre class="prettyprint"><strong>rendered as bold text</strong></pre>
|
||||
|
||||
<h3><code><em></code></h3>
|
||||
<h3>Italics</h3>
|
||||
<p>For emphasizing a snippet of text with <em>stress</em></p>
|
||||
<div class="bs-docs-example">
|
||||
<p>The following snippet of text is <em>rendered as italicized text</em>.</p>
|
||||
@ -170,6 +170,23 @@
|
||||
|
||||
<p><span class="label label-info">Heads up!</span> Feel free to use <code><b></code> and <code><i></code> in HTML5. <code><b></code> is meant to highlight words or phrases without conveying additional importance while <code><i></code> is mostly for voice, technical terms, etc.</p>
|
||||
|
||||
<h3>Emphasis classes</h3>
|
||||
<p>Convey meaning through color with a handful of emphasis utility classes.</p>
|
||||
<div class="bs-docs-example">
|
||||
<p class="muted">Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.</p>
|
||||
<p class="text-warning">Etiam porta sem malesuada magna mollis euismod.</p>
|
||||
<p class="text-error">Donec ullamcorper nulla non metus auctor fringilla.</p>
|
||||
<p class="text-info">Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis.</p>
|
||||
<p class="text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
|
||||
</div>
|
||||
<pre class="prettyprint linenums">
|
||||
<p class="muted">Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.</p>
|
||||
<p class="text-warning">Etiam porta sem malesuada magna mollis euismod.</p>
|
||||
<p class="text-error">Donec ullamcorper nulla non metus auctor fringilla.</p>
|
||||
<p class="text-info">Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis.</p>
|
||||
<p class="text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
|
||||
</pre>
|
||||
|
||||
|
||||
<hr class="bs-docs-separator">
|
||||
|
||||
|
21
docs/templates/pages/base-css.mustache
vendored
21
docs/templates/pages/base-css.mustache
vendored
@ -88,14 +88,14 @@
|
||||
</p>
|
||||
</pre>
|
||||
|
||||
<h3><code><strong></code></h3>
|
||||
<h3>{{_i}}Bold{{/i}}</h3>
|
||||
<p>{{_i}}For emphasizing a snippet of text with <strong>important</strong>{{/i}}</p>
|
||||
<div class="bs-docs-example">
|
||||
<p>The following snippet of text is <strong>rendered as bold text</strong>.</p>
|
||||
</div>
|
||||
<pre class="prettyprint"><strong>rendered as bold text</strong></pre>
|
||||
|
||||
<h3><code><em></code></h3>
|
||||
<h3>{{_i}}Italics{{/i}}</h3>
|
||||
<p>{{_i}}For emphasizing a snippet of text with <em>stress</em>{{/i}}</p>
|
||||
<div class="bs-docs-example">
|
||||
<p>The following snippet of text is <em>rendered as italicized text</em>.</p>
|
||||
@ -104,6 +104,23 @@
|
||||
|
||||
<p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}Feel free to use <code><b></code> and <code><i></code> in HTML5. <code><b></code> is meant to highlight words or phrases without conveying additional importance while <code><i></code> is mostly for voice, technical terms, etc.{{/i}}</p>
|
||||
|
||||
<h3>{{_i}}Emphasis classes{{/i}}</h3>
|
||||
<p>{{_i}}Convey meaning through color with a handful of emphasis utility classes.{{/i}}</p>
|
||||
<div class="bs-docs-example">
|
||||
<p class="muted">Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.</p>
|
||||
<p class="text-warning">Etiam porta sem malesuada magna mollis euismod.</p>
|
||||
<p class="text-error">Donec ullamcorper nulla non metus auctor fringilla.</p>
|
||||
<p class="text-info">Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis.</p>
|
||||
<p class="text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
|
||||
</div>
|
||||
<pre class="prettyprint linenums">
|
||||
<p class="muted">Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.</p>
|
||||
<p class="text-warning">Etiam porta sem malesuada magna mollis euismod.</p>
|
||||
<p class="text-error">Donec ullamcorper nulla non metus auctor fringilla.</p>
|
||||
<p class="text-info">Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis.</p>
|
||||
<p class="text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
|
||||
</pre>
|
||||
|
||||
|
||||
<hr class="bs-docs-separator">
|
||||
|
||||
|
@ -32,9 +32,23 @@ em {
|
||||
cite {
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
// Utility classes
|
||||
.muted {
|
||||
color: @grayLight;
|
||||
}
|
||||
.text-warning {
|
||||
color: @warningText;
|
||||
}
|
||||
.text-error {
|
||||
color: @errorText;
|
||||
}
|
||||
.text-info {
|
||||
color: @infoText;
|
||||
}
|
||||
.text-success {
|
||||
color: @successText;
|
||||
}
|
||||
|
||||
|
||||
// Headings
|
||||
|
Loading…
Reference in New Issue
Block a user