diff --git a/kanken_online/__init__.py b/kanken_online/__init__.py index 41a614c..1ba085a 100644 --- a/kanken_online/__init__.py +++ b/kanken_online/__init__.py @@ -81,12 +81,12 @@ def create_app(test_config=None): out.strokes = kanji_obj.stroke_count out.radical = kanji_obj.radical out.added_strokes = kanji_obj.radical_added_stroke_count - out.goon = " ・ ".join(str(obj.reading) for obj in kanji_obj.goon) - out.kanon = "" - out.toon = "" - out.soon = "" - out.kanyoon = "" - out.kun = "" + out.goon = [str(obj.reading) for obj in kanji_obj.goon] + out.kanon = [str(obj.reading) for obj in kanji_obj.kanon] + out.toon = [str(obj.reading) for obj in kanji_obj.toon] + out.soon = [str(obj.reading) for obj in kanji_obj.soon] + out.kanyoon = [str(obj.reading) for obj in kanji_obj.kanyoon] + out.kun = [str(obj.reading) for obj in kanji_obj.kun] out.meanings = kanji_obj.meanings out.glyph_origin = kanji_obj.glyph_origin diff --git a/kanken_online/static/kanji.css b/kanken_online/static/kanji.css index ed6dc8d..0751544 100644 --- a/kanken_online/static/kanji.css +++ b/kanken_online/static/kanji.css @@ -1,4 +1,4 @@ -ul#reading-list { +ul#reading-list-list { list-style-type: none; } @@ -28,4 +28,17 @@ ul#reading-list { #kun::before { content: "訓"; -} \ No newline at end of file +} + +ul.reading-list { + list-style-type: none; + display: inline-flex; +} + +ul.reading-list > li::after { + content: " ・"; +} + +ul.reading-list > li:last-child::after { + content: none; +} diff --git a/kanken_online/templates/kanji.html b/kanken_online/templates/kanji.html index abd1159..e07f35a 100644 --- a/kanken_online/templates/kanji.html +++ b/kanken_online/templates/kanji.html @@ -28,13 +28,13 @@
-