diff --git a/lyrics/static/lyrics/input.js b/lyrics/static/lyrics/input.js index 774c6f3..425846c 100644 --- a/lyrics/static/lyrics/input.js +++ b/lyrics/static/lyrics/input.js @@ -1,4 +1,5 @@ const update_lyrics_keys = new Set(['Enter', 'ArrowDown', 'ArrowUp']); +const css_font_sizes = ['0%', 'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large']; const string_replacements_element = document.querySelector('#word_replacements_pre'); const word_overrides_element = document.querySelector('#word_replacements_post'); const lyrics_input_element = document.querySelector('#lyrics_input_textarea'); @@ -74,8 +75,10 @@ function lyrics_input_updated() { lyrics_input_element.addEventListener('change', lyrics_input_updated); function update_output_styles() { - style_lyrics_kanji.style.display = lyrics_output_show_kanji_element.checked ? "inline" : "none"; - style_lyrics_romaji.style.display = lyrics_output_show_romaji_element.checked ? "inline" : "none"; + style_lyrics_kanji.style.display = lyrics_output_show_kanji_element.value > 0 ? "inline" : "none"; + style_lyrics_romaji.style.display = lyrics_output_show_romaji_element.value > 0 ? "inline" : "none"; + style_lyrics_kanji.style.fontSize = css_font_sizes[lyrics_output_show_kanji_element.value]; + style_lyrics_romaji.style.fontSize = css_font_sizes[lyrics_output_show_romaji_element.value]; } const stylesheet = document.styleSheets[0]; diff --git a/lyrics/static/lyrics/style.css b/lyrics/static/lyrics/style.css index ef94a4b..a22a1f9 100644 --- a/lyrics/static/lyrics/style.css +++ b/lyrics/static/lyrics/style.css @@ -33,6 +33,10 @@ input { border-radius: 5px; padding: 5px; border-style: solid; + min-height: 40px; +} +#lyrics_output_outer input { + max-width: 32px; } #arrangement_input { max-width: 260px; @@ -64,6 +68,5 @@ input { } .lyrics-kanji { - font-size: xx-large; font-family: Droid Sans Japanese; } diff --git a/lyrics/templates/lyrics/index.html b/lyrics/templates/lyrics/index.html index 6e70adc..e9eab55 100644 --- a/lyrics/templates/lyrics/index.html +++ b/lyrics/templates/lyrics/index.html @@ -64,9 +64,9 @@
- + - +

Lyrics Output