diff --git a/docs/base-css.html b/docs/base-css.html index aed1a5e08b..3c5c8743b1 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -124,84 +124,76 @@
Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
-Make a paragraph stand out by adding .lead
.
Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.
The typographic scale is based on two Less variables in variables.less file: @baseFontSize
and @baseLineHeight
. The first is the base font-size used throughout and the second is the base line-height.
We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more. Customize them and watch Bootstrap adapt as you go.
+The typographic scale is based on two LESS variables in variables.less: @baseFontSize
and @baseLineHeight
. The first is the base font-size used throughout and the second is the base line-height. We use those variables and some simple math to create the margins, paddings, and line-heights of all our type and more. Customize them and Bootstrap adapts.
Element | -Usage | -Optional | -
---|---|---|
- <strong>
- |
- - For emphasizing a snippet of text with important - | -- None - | -
- <em>
- |
- - For emphasizing a snippet of text with stress - | -- None - | -
- <abbr>
- |
- - Wraps abbreviations and acronyms to show the expanded version on hover - | -
- Include optional .initialism class for uppercase abbreviations.
- |
-
- <address>
- |
- - For contact information for its nearest ancestor or the entire body of work - | -
- Preserve formatting by ending all lines with <br>
- |
-
Make use of HTML's default emphasis tags, <strong>
and <em>
.
<strong>
For emphasizing a snippet of text with important
Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.
+The following snippet of text is rendered as bold text.
Note: Feel free to use <b>
and <i>
in HTML5. <b>
is meant to highlight words or phrases without conveying additional importance while <i>
is mostly for voice, technical terms, etc.
+<strong>rendered as bold text</strong> +-
Here are two examples of how the <address>
tag can be used:
<em>
For emphasizing a snippet of text with stress
+The following snippet of text is rendered as italicized text.
++<em>rendered as italicized text</em> ++ +
Heads up! Feel free to use <b>
and <i>
in HTML5. <b>
is meant to highlight words or phrases without conveying additional importance while <i>
is mostly for voice, technical terms, etc.
Stylized implemenation of HTML's <abbr>
element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title
attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.
<abbr>
For expanded text on long hover of an abbreviation, include the title
attribute.
An abbreviation of the word attribute is attr.
++<abbr title="attribute">attr</abbr> ++ +
<abbr class="initialism">
Add .initialism
to an abbreviation for a slightly smaller font-size.
HTML is the best thing since sliced bread.
++<abbr title="attribute" class="initialism">attr</abbr> ++ + +
Present contact information for the nearest ancestor or the entire body of work.
+ +<address>
Preserve formatting by ending all lines with <br>
.
+<address> + <strong>Twitter, Inc.</strong><br> + 795 Folsom Ave, Suite 600<br> + San Francisco, CA 94107<br> + <abbr title="Phone">P:</abbr> (123) 456-7890 +</address> -+ + +Example abbreviations
-Abbreviations with a
-title
attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.--An abbreviation of the word attribute is attr.
-Add the
-initialism
class to an abbreviation for a slightly smaller font-size.-+<address> + <strong>Full Name</strong><br> + <a href="mailto:#">first.last@gmail.com</a> +</address> +HTML is the best thing since sliced bread.
-
Element | -Usage | -Optional | -
---|---|---|
- <blockquote>
- |
- - Block-level element for quoting content from another source - | -
- Add .pull-left and .pull-right classes for floated options
- |
-
- <small>
- |
- - Optional element for adding a user-facing citation, typically an author with title of work - | -
- Place the <cite> around the title or name of source
- |
-
To include a blockquote, wrap <blockquote>
around any HTML as the quote. For straight quotes we recommend a <p>
.
Include an optional <small>
element to cite your source and you'll get an em dash —
before it for styling purposes.
-<blockquote> - <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p> - <small>Someone famous</small> -</blockquote> --
Default blockquotes are styled as such:
+For quoting blocks of content from another source within your document.
+ +Wrap <blockquote>
around any HTML as the quote. For straight quotes we recommend a <p>
.
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.
- Someone famous in Body of work +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
To float your blockquote to the right, add class="pull-right"
:
+<blockquote> + <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> +</blockquote> ++ +
Style and content changes for simple variations on a standard blockquote.
+ +Add <small>
tag for identifying the source. Wrap the name of the source work in <cite>
.
++Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+ Someone famous in Source Title +
+<blockquote> + <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> + <small>Someone famous <cite title="Source Title">Source Title</cite></small> +</blockquote> ++ +
Use .pull-left
and .pull-right
classes for floated, right-aligned blockquote content.
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.
- Someone famous in Body of work +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+ Someone famous in Source Title
+<blockquote class="pull-right"> + <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> + <small>Someone famous <cite title="Source Title">Source Title</cite></small> +</blockquote> ++ + +
Heads up!
Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow
. In narrower viewports, they will change to the default stacked layout.
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 8b1e7c0c50..4cfe05db5e 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -49,7 +49,7 @@
{{! Body copy .lead }}
-
{{_i}}Make a paragraph stand out by adding .lead
.{{/i}}
Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.
@@ -57,80 +57,72 @@ {{! Using LESS }}{{_i}}The typographic scale is based on two Less variables in variables.less file: @baseFontSize
and @baseLineHeight
. The first is the base font-size used throughout and the second is the base line-height.{{/i}}
{{_i}}We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more. Customize them and watch Bootstrap adapt as you go.{{/i}}
+{{_i}}The typographic scale is based on two LESS variables in variables.less: @baseFontSize
and @baseLineHeight
. The first is the base font-size used throughout and the second is the base line-height. We use those variables and some simple math to create the margins, paddings, and line-heights of all our type and more. Customize them and Bootstrap adapts.{{/i}}
{{_i}}Element{{/i}} | -{{_i}}Usage{{/i}} | -{{_i}}Optional{{/i}} | -
---|---|---|
- <strong>
- |
- - {{_i}}For emphasizing a snippet of text with important{{/i}} - | -- {{_i}}None{{/i}} - | -
- <em>
- |
- - {{_i}}For emphasizing a snippet of text with stress{{/i}} - | -- {{_i}}None{{/i}} - | -
- <abbr>
- |
- - {{_i}}Wraps abbreviations and acronyms to show the expanded version on hover{{/i}} - | -
- {{_i}}Include optional .initialism class for uppercase abbreviations.{{/i}}
- |
-
- <address>
- |
- - {{_i}}For contact information for its nearest ancestor or the entire body of work{{/i}} - | -
- {{_i}}Preserve formatting by ending all lines with <br> {{/i}}
- |
-
{{_i}}Make use of HTML's default emphasis tags, <strong>
and <em>
.{{/i}}
<strong>
{{_i}}For emphasizing a snippet of text with important{{/i}}
Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.
+The following snippet of text is rendered as bold text.
{{_i}}Note: Feel free to use <b>
and <i>
in HTML5. <b>
is meant to highlight words or phrases without conveying additional importance while <i>
is mostly for voice, technical terms, etc.{{/i}}
+<strong>rendered as bold text</strong> ++ +
<em>
{{_i}}For emphasizing a snippet of text with stress{{/i}}
+The following snippet of text is rendered as italicized text.
++<em>rendered as italicized text</em> ++ +
{{_i}}Heads up!{{/i}} {{_i}}Feel free to use <b>
and <i>
in HTML5. <b>
is meant to highlight words or phrases without conveying additional importance while <i>
is mostly for voice, technical terms, etc.{{/i}}
{{_i}}Stylized implemenation of HTML's <abbr>
element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title
attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}
<abbr>
{{_i}}For expanded text on long hover of an abbreviation, include the title
attribute.{{/i}}
{{_i}}An abbreviation of the word attribute is attr.{{/i}}
++<abbr title="attribute">attr</abbr> ++ +
<abbr class="initialism">
{{_i}}Add .initialism
to an abbreviation for a slightly smaller font-size.{{/i}}
{{_i}}HTML is the best thing since sliced bread.{{/i}}
++<abbr title="attribute" class="initialism">attr</abbr> ++ + +
{{_i}}Here are two examples of how the <address>
tag can be used:{{/i}}
{{_i}}Present contact information for the nearest ancestor or the entire body of work.{{/i}}
+ +<address>
{{_i}}Preserve formatting by ending all lines with <br>
.{{/i}}
+<address> + <strong>Twitter, Inc.</strong><br> + 795 Folsom Ave, Suite 600<br> + San Francisco, CA 94107<br> + <abbr title="Phone">P:</abbr> (123) 456-7890 +</address> - {{! Abbreviations }} -+ + +{{_i}}Example abbreviations{{/i}}
-{{_i}}Abbreviations with a
-title
attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.{{/i}}--{{_i}}An abbreviation of the word attribute is attr.{{/i}}
-{{_i}}Add the
-initialism
class to an abbreviation for a slightly smaller font-size.{{/i}}-+<address> + <strong>{{_i}}Full Name{{/i}}</strong><br> + <a href="mailto:#">{{_i}}first.last@gmail.com{{/i}}</a> +</address> +{{_i}}HTML is the best thing since sliced bread.{{/i}}
-
{{_i}}Element{{/i}} | -{{_i}}Usage{{/i}} | -{{_i}}Optional{{/i}} | -
---|---|---|
- <blockquote>
- |
- - {{_i}}Block-level element for quoting content from another source{{/i}} - | -
- {{_i}}Add .pull-left and .pull-right classes for floated options{{/i}}
- |
-
- <small>
- |
- - {{_i}}Optional element for adding a user-facing citation, typically an author with title of work{{/i}} - | -
- {{_i}}Place the <cite> around the title or name of source{{/i}}
- |
-
{{_i}}To include a blockquote, wrap <blockquote>
around any HTML as the quote. For straight quotes we recommend a <p>
.{{/i}}
{{_i}}Include an optional <small>
element to cite your source and you'll get an em dash —
before it for styling purposes.{{/i}}
-<blockquote> - <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p> - <small>{{_i}}Someone famous{{/i}}</small> -</blockquote> --
{{_i}}Default blockquotes are styled as such:{{/i}}
+{{_i}}For quoting blocks of content from another source within your document.{{/i}}
+ +{{_i}}Wrap <blockquote>
around any HTML as the quote. For straight quotes we recommend a <p>
.{{/i}}
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.
- {{_i}}Someone famous in Body of work{{/i}} +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
{{_i}}To float your blockquote to the right, add class="pull-right"
:{{/i}}
+<blockquote> + <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> +</blockquote> ++ +
{{_i}}Style and content changes for simple variations on a standard blockquote.{{/i}}
+ +{{_i}}Add <small>
tag for identifying the source. Wrap the name of the source work in <cite>
.{{/i}}
++Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+ {{_i}}Someone famous in Source Title{{/i}} +
+<blockquote> + <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> + <small>{{_i}}Someone famous <cite title="Source Title">Source Title</cite>{{/i}}</small> +</blockquote> ++ +
{{_i}}Use .pull-left
and .pull-right
classes for floated, right-aligned blockquote content.{{/i}}
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.
- {{_i}}Someone famous in Body of work{{/i}} +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+ {{_i}}Someone famous in Source Title{{/i}}
+<blockquote class="pull-right"> + <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> + <small>{{_i}}Someone famous <cite title="Source Title">Source Title</cite>{{/i}}</small> +</blockquote> ++ + +
{{_i}}Heads up!{{/i}}
{{_i}}Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow
. In narrower viewports, they will change to the default stacked layout.{{/i}}