diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e550b175ec..70f77af7ef 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -580,11 +580,6 @@ p { margin: 0 0 10px; } -p small { - font-size: 12px; - color: #999999; -} - .lead { margin-bottom: 20px; font-size: 20px; @@ -592,6 +587,26 @@ p small { line-height: 30px; } +small { + font-size: 85%; +} + +strong { + font-weight: bold; +} + +em { + font-style: italic; +} + +cite { + font-style: normal; +} + +.muted { + color: #999999; +} + h1, h2, h3, @@ -730,18 +745,6 @@ hr { border-bottom: 1px solid #ffffff; } -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - -.muted { - color: #999999; -} - abbr[title] { cursor: help; border-bottom: 1px dotted #999999; @@ -810,14 +813,6 @@ address { line-height: 20px; } -small { - font-size: 100%; -} - -cite { - font-style: normal; -} - code, pre { padding: 0 3px 2px; diff --git a/docs/base-css.html b/docs/base-css.html index 2be40cd2c0..df5df24027 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -141,7 +141,18 @@

Emphasis

-

Make use of HTML's default emphasis tags, <strong> and <em>.

+

Make use of HTML's default emphasis tags with lightweight styles.

+ +

<small>

+

For de-emphasizing inline or blocks of text, use the small tag.

+
+

This line of text is meant to be treated as fine print.

+
+
+<p>
+  <small>This line of text is meant to be treated as fine print.</small>
+</p>
+

<strong>

For emphasizing a snippet of text with important

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 48b874e1ec..d1d8691ba1 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -75,7 +75,18 @@ {{! Emphasis }}

{{_i}}Emphasis{{/i}}

-

{{_i}}Make use of HTML's default emphasis tags, <strong> and <em>.{{/i}}

+

{{_i}}Make use of HTML's default emphasis tags with lightweight styles.{{/i}}

+ +

<small>

+

{{_i}}For de-emphasizing inline or blocks of text, use the small tag.{{/i}}

+
+

This line of text is meant to be treated as fine print.

+
+
+<p>
+  <small>This line of text is meant to be treated as fine print.</small>
+</p>
+

<strong>

{{_i}}For emphasizing a snippet of text with important{{/i}}

diff --git a/less/type.less b/less/type.less index b1e3230337..58723f788c 100644 --- a/less/type.less +++ b/less/type.less @@ -8,10 +8,6 @@ p { margin: 0 0 @baseLineHeight / 2; - small { - font-size: @baseFontSize - 2; - color: @grayLight; - } } .lead { margin-bottom: @baseLineHeight; @@ -21,6 +17,26 @@ p { } +// Emphasis & misc +// ------------------------- + +small { + font-size: 85%; // Ex: 14px base font * 85% = about 12px +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} +.muted { + color: @grayLight; +} + + // Headings // ------------------------- @@ -123,17 +139,6 @@ hr { border-bottom: 1px solid @white; } -// Emphasis -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: @grayLight; -} - // Abbreviations and acronyms abbr[title] { cursor: help; @@ -199,11 +204,3 @@ address { font-style: normal; line-height: @baseLineHeight; } - -// Misc -small { - font-size: 100%; -} -cite { - font-style: normal; -}