mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00
Code Activity

more consistent variable naming patterns

Browse Source
This commit is contained in:
Mark Otto
2012-11-30 14:45:25 -08:00
parent 7a3d15eb21
commit b0e2b5813d
33 changed files with 221 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/base-css.html
+1 -1
View File
@@ -131,7 +131,7 @@
<pre class="prettyprint">&lt;p class="lead"&gt;...&lt;/p&gt;</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">
docs/customize.html
+17 -15
View File
@@ -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>
docs/scaffolding.html
+1 -1
View File
@@ -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>
docs/templates/pages/base-css.mustache
Vendored
+1 -1
View File
@@ -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">
docs/templates/pages/customize.mustache
Vendored
+15 -15
View File
@@ -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>
docs/templates/pages/scaffolding.mustache
Vendored
+1 -1
View File
@@ -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>