Skip to content
GitLab
Commit e0c85fb6 authored by Mark Otto's avatar Mark Otto
Browse files

use new font-stack mixins in base and alt font family mixins

parent 78e37e7d
2 merge requests!2929Responsive video - from zurp's foundation,!28752.0.3 wip
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 22 deletions
+22 -22
docs/assets/bootstrap.zip
+ 0
- 0
View file @ e0c85fb6
No preview for this file type
docs/download.html
+ 8
- 8
View file @ e0c85fb6
...@@ -276,14 +276,20 @@ ...@@ -276,14 +276,20 @@
<input type="text" class="span3" placeholder="2.127659574%"> <input type="text" class="span3" placeholder="2.127659574%">
<h3>Typography</h3> <h3>Typography</h3>
<label>@sansFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@serifFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@monoFontFamily</label>
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
<label>@baseFontSize</label> <label>@baseFontSize</label>
<input type="text" class="span3" placeholder="13px"> <input type="text" class="span3" placeholder="13px">
<label>@baseFontFamily</label> <label>@baseFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif"> <input type="text" class="span3" placeholder="@sansFontFamily">
<label>@baseLineHeight</label> <label>@baseLineHeight</label>
<input type="text" class="span3" placeholder="18px"> <input type="text" class="span3" placeholder="18px">
<label>@altFontFamily</label> <label>@altFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif;"> <input type="text" class="span3" placeholder="@serifFontFamily">
<label>@headingsFontFamily</label> <label>@headingsFontFamily</label>
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@headingsFontWeight</label> <label>@headingsFontWeight</label>
...@@ -296,12 +302,6 @@ ...@@ -296,12 +302,6 @@
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@heroUnitLeadColor</label> <label>@heroUnitLeadColor</label>
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@serifFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@sansFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@monoFontFamily</label>
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
<h3>Tables</h3> <h3>Tables</h3>
......
docs/templates/pages/download.mustache
+ 8
- 8
View file @ e0c85fb6
...@@ -200,14 +200,20 @@ ...@@ -200,14 +200,20 @@
<input type="text" class="span3" placeholder="2.127659574%"> <input type="text" class="span3" placeholder="2.127659574%">
<h3>{{_i}}Typography{{/i}}</h3> <h3>{{_i}}Typography{{/i}}</h3>
<label>@sansFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@serifFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@monoFontFamily</label>
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
<label>@baseFontSize</label> <label>@baseFontSize</label>
<input type="text" class="span3" placeholder="13px"> <input type="text" class="span3" placeholder="13px">
<label>@baseFontFamily</label> <label>@baseFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif"> <input type="text" class="span3" placeholder="@sansFontFamily">
<label>@baseLineHeight</label> <label>@baseLineHeight</label>
<input type="text" class="span3" placeholder="18px"> <input type="text" class="span3" placeholder="18px">
<label>@altFontFamily</label> <label>@altFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif;"> <input type="text" class="span3" placeholder="@serifFontFamily">
<label>@headingsFontFamily</label> <label>@headingsFontFamily</label>
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@headingsFontWeight</label> <label>@headingsFontWeight</label>
...@@ -220,12 +226,6 @@ ...@@ -220,12 +226,6 @@
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@heroUnitLeadColor</label> <label>@heroUnitLeadColor</label>
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@serifFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@sansFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@monoFontFamily</label>
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
<h3>{{_i}}Tables{{/i}}</h3> <h3>{{_i}}Tables{{/i}}</h3>
......
less/variables.less
+ 6
- 6
View file @ e0c85fb6
...@@ -45,19 +45,19 @@ ...@@ -45,19 +45,19 @@
// Typography // Typography
// ------------------------- // -------------------------
@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
@serifFontFamily: Georgia, "Times New Roman", Times, serif;
@monoFontFamily: Menlo, Monaco, "Courier New", monospace;
@baseFontSize: 13px; @baseFontSize: 13px;
@baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; @baseFontFamily: @sansFontFamily;
@baseLineHeight: 18px; @baseLineHeight: 18px;
@altFontFamily: Georgia, "Times New Roman", Times, serif; @altFontFamily: @serifFontFamily;
@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
@headingsFontWeight: bold; // instead of browser default, bold @headingsFontWeight: bold; // instead of browser default, bold
@headingsColor: inherit; // empty to use BS default, @textColor @headingsColor: inherit; // empty to use BS default, @textColor
@serifFontFamily: Georgia, "Times New Roman", Times, serif;
@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
@monoFontFamily: Menlo, Monaco, "Courier New", monospace;
// Tables // Tables
// ------------------------- // -------------------------
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment