diff --git a/templates/Japanese words/template.css b/templates/Japanese words/template.css index 42804c2..179cfc1 100644 --- a/templates/Japanese words/template.css +++ b/templates/Japanese words/template.css @@ -1,23 +1,40 @@ @charset "utf-8"; + @font-face { - font-family: "Yu Mincho"; - src: local("Yu Mincho"), local("游明朝"), url("_yumin.ttf"); + font-family: "KanjiStrokeOrders"; + src: local("KanjiStrokeOrders"), url("_kso.ttf"); } + @font-face { - font-family: "Yu Mincho"; - src: local("Yu Mincho Demibold"), local("游明朝 Demibold"), url("_yumindb.ttf"); + font-family: "Local Mincho"; + src: local("Yu Mincho"), local("游明朝"), local("IPAexMincho"), local("IPAex明朝"), local("IPAMincho"), local("IPA明朝"), local("IPAPMincho"), local("IPA P明朝"), local("TakaoExMincho"), local("TakaoEx明朝"), url("_yumin.ttf"); + font-weight: normal; +} + +@font-face { + font-family: "Local Mincho"; + src: local("Noto Serif CJK JP SemiBold"), local("Noto Serif CJK JP DemiLight"), local("Yu Mincho Demibold"), local("游明朝 Demibold"), url("_yumindb.ttf"); font-weight: 600; } + @font-face { font-family: "acgyosyo"; src: local("acgyosyo"), local("英椎行書"), url("_acgyosyo.ttf"); } -* { +*, +*::before, +*::after { box-sizing: border-box; padding: 0; margin: 0; } + +b, +strong { + font-weight: 600; +} + .card { font-size: 24px; text-align: left; @@ -29,8 +46,7 @@ .card, ruby rt { - font-family: "Noto Serif", "Noto Serif CJK JP", Yu Mincho, "Liberation Serif", "Times New Roman", Times, Georgia, - Serif; + font-family: "Noto Serif", "Noto Serif CJK JP", "IPAexMincho", "Yu Mincho", "Local Mincho", "Liberation Serif", "Times New Roman", Times, Georgia, Serif; } @media screen and (min-width: 820px) { @@ -80,18 +96,19 @@ header .tags { /* question */ -#question, -#question ruby rt { - font-family: "acgyosyo", "Yu Mincho", "Noto Serif", "Noto Serif CJK JP"; +#question { + font-family: "acgyosyo", "Noto Serif", "Noto Serif CJK JP", "IPAexMincho", "Yu Mincho", "Local Mincho", "Liberation Serif", "Times New Roman", Times, Georgia, Serif; } .japanese { text-align: center; font-size: 40px; } -.definition { +.definition, +.notes { text-align: left; margin: 10px 0; line-height: 1.5; + font-weight: 300; } .pronunciation { text-align: center; @@ -224,9 +241,9 @@ ol { margin: 0px; padding: 0px; } -ul li, -ol li { - margin-bottom: 1em; +ul li + li, +ol li + li { + margin-block-start: 0.33em; } .pronunciation ol > li { display: inline; diff --git a/templates/Japanese words/template.json b/templates/Japanese words/template.json index f593785..ed17d60 100644 --- a/templates/Japanese words/template.json +++ b/templates/Japanese words/template.json @@ -4,10 +4,12 @@ "VocabKanji", "VocabFurigana", "VocabPitchPattern", + "VocabPitchNum", "VocabDef", "VocabAudio", "Image", - "MorphManFocus" + "Notes", + "Focus" ], "cardTemplates": [ "Recognition"