mirror of
https://github.com/danbulant/dribbblish-dynamic-theme
synced 2026-05-24 12:35:05 +00:00
add spiceFont mixin
This commit is contained in:
parent
fc6ac2e35c
commit
d1d15d2425
2 changed files with 32 additions and 8 deletions
|
|
@ -4,7 +4,7 @@ $font-names: (
|
|||
"glue": "GoogleSans",
|
||||
"info": "Roboto"
|
||||
);
|
||||
$font-styles: (
|
||||
$font-weights: (
|
||||
"Thin": 100,
|
||||
"Light": 300,
|
||||
"Regular": 400,
|
||||
|
|
@ -13,8 +13,9 @@ $font-styles: (
|
|||
"Black": 900
|
||||
);
|
||||
|
||||
// add @font-face rules
|
||||
@each $prefix, $font in $font-names {
|
||||
@each $style, $weight in $font-styles {
|
||||
@each $style, $weight in $font-weights {
|
||||
@font-face {
|
||||
font-family: $font;
|
||||
font-weight: $weight;
|
||||
|
|
@ -24,6 +25,30 @@ $font-styles: (
|
|||
}
|
||||
}
|
||||
|
||||
// spiceFont mixin
|
||||
@mixin spiceFont($type: "glue", $size: null, $weight: null) {
|
||||
@if map-has-key($font-names, $type) {
|
||||
font-family: var(--#{$type}-font-family);
|
||||
} @else {
|
||||
@error "$type is invalid";
|
||||
}
|
||||
|
||||
@if $size != null {
|
||||
font-size: $size;
|
||||
}
|
||||
|
||||
@if $weight != null {
|
||||
@if type-of($weight) == "number" and unit($weight) == "" {
|
||||
font-weight: $weight;
|
||||
} @else if map-has-key($font-weights, $weight) {
|
||||
font-weight: #{map-get($font-weights, $weight)};
|
||||
} @else {
|
||||
@error "$weight is invalid";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// set font variables
|
||||
body {
|
||||
--glue-font-family: #{map-get($font-names, "glue")}, #{map-get($font-names, "info")}, spotify-circular, spotify-circular-cyrillic, spotify-circular-arabic, spotify-circular-hebrew, Helvetica Neue, helvetica, arial, Hiragino Kaku Gothic Pro, Meiryo, MS Gothic, sans-serif;
|
||||
--info-font-family: #{map-get($font-names, "info")}, spotify-circular, spotify-circular-cyrillic, spotify-circular-arabic, spotify-circular-hebrew, Helvetica Neue, helvetica, arial, Hiragino Kaku Gothic Pro, Meiryo, MS Gothic, sans-serif;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
.main-type-ballad,
|
||||
.main-type-balladBold,
|
||||
.main-type-canon {
|
||||
font-family: var(--info-font-family);
|
||||
@include spiceFont("info");
|
||||
letter-spacing: normal;
|
||||
}
|
||||
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
}
|
||||
|
||||
.lyrics-lyricsContainer-LyricsLine {
|
||||
font-family: var(--glue-font-family);
|
||||
@include spiceFont("glue");
|
||||
letter-spacing: -0.03em !important;
|
||||
}
|
||||
|
||||
|
|
@ -836,7 +836,6 @@ li.GlueDropTarget {
|
|||
.main-nowPlayingWidget-nowPlaying {
|
||||
justify-content: center;
|
||||
|
||||
// Workaround for #73 (https://github.com/JulienMaille/dribbblish-dynamic-theme/issues/73)
|
||||
& button {
|
||||
color: spiceColor("subtext");
|
||||
|
||||
|
|
@ -901,9 +900,9 @@ li.GlueDropTarget {
|
|||
|
||||
.main-collectionLinkButton-collectionLinkText,
|
||||
.main-createPlaylistButton-text,
|
||||
.main-navBar-navBarLink > span {
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
.main-navBar-navBarLink > span,
|
||||
.main-rootlist-rootlistItemLink > span {
|
||||
@include spiceFont("info", 14px, "Regular");
|
||||
letter-spacing: normal;
|
||||
line-height: 20px;
|
||||
text-transform: none;
|
||||
|
|
|
|||
Loading…
Reference in a new issue