mirror of
https://github.com/locomotivemtl/locomotive-boilerplate.git
synced 2026-01-15 00:55:08 +08:00
Merge branch 'master' into feature/css-variables
This commit is contained in:
@@ -14,10 +14,9 @@
|
||||
|
||||
html {
|
||||
min-height: 100%; // [2]
|
||||
line-height: $line-height;
|
||||
line-height: $line-height; // [3]
|
||||
font-family: ff("sans");
|
||||
color: $font-color;
|
||||
line-height: $line-height; // [3]
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ $font-fallback-mono: Menlo, Consolas, Monaco, Liberation Mono, Lucida Console
|
||||
// <font-id>: (<font-name>, <font-fallbacks>)
|
||||
// ```
|
||||
$font-families: (
|
||||
sans: join(Source Sans, $font-fallback-sans, $separator: comma),
|
||||
sans: join("Source Sans", $font-fallback-sans, $separator: comma),
|
||||
);
|
||||
|
||||
// List of custom font faces as tuples.
|
||||
@@ -37,10 +37,10 @@ $font-families: (
|
||||
// <font-name> <font-file-basename> <font-weight> <font-style>
|
||||
// ```
|
||||
$font-faces: (
|
||||
(Source Sans, "SourceSans3-Bold", 700, normal),
|
||||
(Source Sans, "SourceSans3-BoldIt", 700, italic),
|
||||
(Source Sans, "SourceSans3-Regular", 400, normal),
|
||||
(Source Sans, "SourceSans3-RegularIt", 400, italic),
|
||||
("Source Sans", "SourceSans3-Bold", 700, normal),
|
||||
("Source Sans", "SourceSans3-BoldIt", 700, italic),
|
||||
("Source Sans", "SourceSans3-Regular", 400, normal),
|
||||
("Source Sans", "SourceSans3-RegularIt", 400, italic),
|
||||
);
|
||||
|
||||
// Typography
|
||||
|
||||
Reference in New Issue
Block a user