diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/base-css.html | 2 | ||||
| -rw-r--r-- | docs/customize.html | 32 | ||||
| -rw-r--r-- | docs/scaffolding.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 2 | ||||
| -rw-r--r-- | docs/templates/pages/customize.mustache | 30 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 2 |
6 files changed, 36 insertions, 34 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index ce9f16857..808fc798a 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -131,7 +131,7 @@ <pre class="prettyprint"><p class="lead">...</p></pre> <h3>Built with Less</h3> - <p>The typographic scale is based on two LESS variables in <strong>variables.less</strong>: <code>@base-font-size</code> and <code>@base-line-height</code>. 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.</p> + <p>The typographic scale is based on two LESS variables in <strong>variables.less</strong>: <code>@font-size-base</code> and <code>@line-height-base</code>. 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.</p> <hr class="bs-docs-separator"> diff --git a/docs/customize.html b/docs/customize.html index 16a76e3a7..ffa219d83 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -296,13 +296,15 @@ <label>@font-family-monospace</label> <input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace"> - <label>@base-font-size</label> + <label>@font-size-base</label> <input type="text" class="span3" placeholder="14px"> - <label>@base-font-family</label> + <label>@font-family-base</label> <input type="text" class="span3" placeholder="@font-family-sans-serif"> - <label>@base-line-height</label> + <label>@line-height-base</label> <input type="text" class="span3" placeholder="20px"> + <label>@altFontFamily</label> + <input type="text" class="span3" placeholder="@font-family-serif"> <label>@headings-font-family</label> <input type="text" class="span3" placeholder="inherit"> <label>@headings-font-weight</label> @@ -310,25 +312,25 @@ <label>@headingsColor</label> <input type="text" class="span3" placeholder="inherit"> - <label>@fontSizeLarge</label> - <input type="text" class="span3" placeholder="@base-font-size * 1.25"> - <label>@fontSizeSmall</label> - <input type="text" class="span3" placeholder="@base-font-size * 0.85"> - <label>@fontSizeMini</label> - <input type="text" class="span3" placeholder="@base-font-size * 0.75"> + <label>@font-size-large</label> + <input type="text" class="span3" placeholder="@font-size-base * 1.25"> + <label>@font-size-small</label> + <input type="text" class="span3" placeholder="@font-size-base * 0.85"> + <label>@font-size-mini</label> + <input type="text" class="span3" placeholder="@font-size-base * 0.75"> - <label>@paddingLarge</label> + <label>@padding-large</label> <input type="text" class="span3" placeholder="11px 19px"> - <label>@paddingSmall</label> + <label>@padding-small</label> <input type="text" class="span3" placeholder="2px 10px"> - <label>@paddingMini</label> + <label>@padding-mini</label> <input type="text" class="span3" placeholder="1px 6px"> - <label>@baseBorderRadius</label> + <label>@border-radius-base</label> <input type="text" class="span3" placeholder="4px"> - <label>@borderRadiusLarge</label> + <label>@border-radius-large</label> <input type="text" class="span3" placeholder="6px"> - <label>@borderRadiusSmall</label> + <label>@border-radius-small</label> <input type="text" class="span3" placeholder="3px"> <label>@heroUnitBackground</label> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 0a1c6d1ae..f591b6546 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -113,7 +113,7 @@ <ul> <li>Remove <code>margin</code> on the body</li> <li>Set <code>background-color: white;</code> on the <code>body</code></li> - <li>Use the <code>@base-font-family</code>, <code>@base-font-size</code>, and <code>@base-line-height</code> attributes as our typographic base</li> + <li>Use the <code>@font-family-base</code>, <code>@font-size-base</code>, and <code>@line-height-base</code> attributes as our typographic base</li> <li>Set the global link color via <code>@link-color</code> and apply link underlines only on <code>:hover</code></li> </ul> <p>These styles can be found within <strong>scaffolding.less</strong>.</p> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index e36eca214..a5dc0b07c 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -67,7 +67,7 @@ {{! Using LESS }} <h3>{{_i}}Built with Less{{/i}}</h3> - <p>{{_i}}The typographic scale is based on two LESS variables in <strong>variables.less</strong>: <code>@base-font-size</code> and <code>@base-line-height</code>. 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}}</p> + <p>{{_i}}The typographic scale is based on two LESS variables in <strong>variables.less</strong>: <code>@font-size-base</code> and <code>@line-height-base</code>. 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}}</p> <hr class="bs-docs-separator"> diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 37490a698..a927ab97b 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -228,11 +228,11 @@ <label>@font-family-monospace</label> <input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace"> - <label>@base-font-size</label> + <label>@font-size-base</label> <input type="text" class="span3" placeholder="14px"> - <label>@base-font-family</label> + <label>@font-family-base</label> <input type="text" class="span3" placeholder="@font-family-sans-serif"> - <label>@base-line-height</label> + <label>@line-height-base</label> <input type="text" class="span3" placeholder="20px"> <label>@headings-font-family</label> @@ -242,25 +242,25 @@ <label>@headingsColor</label> <input type="text" class="span3" placeholder="inherit"> - <label>@fontSizeLarge</label> - <input type="text" class="span3" placeholder="@base-font-size * 1.25"> - <label>@fontSizeSmall</label> - <input type="text" class="span3" placeholder="@base-font-size * 0.85"> - <label>@fontSizeMini</label> - <input type="text" class="span3" placeholder="@base-font-size * 0.75"> + <label>@font-size-large</label> + <input type="text" class="span3" placeholder="@font-size-base * 1.25"> + <label>@font-size-small</label> + <input type="text" class="span3" placeholder="@font-size-base * 0.85"> + <label>@font-size-mini</label> + <input type="text" class="span3" placeholder="@font-size-base * 0.75"> - <label>@paddingLarge</label> + <label>@padding-large</label> <input type="text" class="span3" placeholder="11px 19px"> - <label>@paddingSmall</label> + <label>@padding-small</label> <input type="text" class="span3" placeholder="2px 10px"> - <label>@paddingMini</label> + <label>@padding-mini</label> <input type="text" class="span3" placeholder="1px 6px"> - <label>@baseBorderRadius</label> + <label>@border-radius-base</label> <input type="text" class="span3" placeholder="4px"> - <label>@borderRadiusLarge</label> + <label>@border-radius-large</label> <input type="text" class="span3" placeholder="6px"> - <label>@borderRadiusSmall</label> + <label>@border-radius-small</label> <input type="text" class="span3" placeholder="3px"> <label>@heroUnitBackground</label> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 4c7b7e89a..127d09d25 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -45,7 +45,7 @@ <ul> <li>{{_i}}Remove <code>margin</code> on the body{{/i}}</li> <li>{{_i}}Set <code>background-color: white;</code> on the <code>body</code>{{/i}}</li> - <li>{{_i}}Use the <code>@base-font-family</code>, <code>@base-font-size</code>, and <code>@base-line-height</code> attributes as our typographic base{{/i}}</li> + <li>{{_i}}Use the <code>@font-family-base</code>, <code>@font-size-base</code>, and <code>@line-height-base</code> attributes as our typographic base{{/i}}</li> <li>{{_i}}Set the global link color via <code>@link-color</code> and apply link underlines only on <code>:hover</code>{{/i}}</li> </ul> <p>{{_i}}These styles can be found within <strong>scaffolding.less</strong>.{{/i}}</p> |