diff options
author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2021-03-16 18:48:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-16 18:48:24 -0400 |
commit | 28f97ba40b165eb88f1e6b9820d30e7b93b13fe3 (patch) | |
tree | e41ae3a712a867405fb299d02155acce3416e6bf /ext | |
parent | 97ac9099e80697cbee7247fad1e92364fe32dbc3 (diff) |
Update display results style (#1536)
* Expose resultOutputMode
* Update display styles
Diffstat (limited to 'ext')
-rw-r--r-- | ext/css/display.css | 22 | ||||
-rw-r--r-- | ext/js/display/display.js | 1 |
2 files changed, 12 insertions, 11 deletions
diff --git a/ext/css/display.css b/ext/css/display.css index ca63ad97..626f78bd 100644 --- a/ext/css/display.css +++ b/ext/css/display.css @@ -688,7 +688,7 @@ button.action-button[data-icon=play-audio]::before { button.action-button[data-icon=source-term]::before { background-image: url('/images/source-term.svg'); } -.entry[data-type=term][data-expression-multi=true] .actions>button.action-button.action-play-audio { +:root[data-result-output-mode=merge] .entry[data-type=term] .actions>button.action-button.action-play-audio { display: none; } .action-button-badge { @@ -850,14 +850,14 @@ button.action-button[data-icon=source-term]::before { display: inline-block; } -.entry[data-expression-multi=true] .expression[data-frequency=popular] { +:root[data-result-output-mode=merge] .expression[data-frequency=popular] { --expression-current-text-color: var(--expression-text-color-popular); --expression-current-reading-text-color: var(--expression-reading-text-color-popular); --expression-current-furigana-text-color: var(--expression-furigana-text-color-popular); --expression-current-kanji-text-color: var(--expression-kanji-text-color-popular); --expression-current-kanji-border-color: var(--expression-kanji-border-color-popular); } -.entry[data-expression-multi=true] .expression[data-frequency=rare] { +:root[data-result-output-mode=merge] .expression[data-frequency=rare] { --expression-current-text-color: var(--expression-text-color-rare); --expression-current-reading-text-color: var(--expression-reading-text-color-rare); --expression-current-furigana-text-color: var(--expression-furigana-text-color-rare); @@ -915,7 +915,7 @@ button.action-button[data-icon=source-term]::before { text-decoration: none; cursor: pointer; } -.entry[data-expression-multi=true] .expression-list-details { +:root[data-result-output-mode=merge] .expression-list-details { display: block; } :root[data-term-display-mode=ruby-and-reading] .expression-text-outer::after, @@ -1069,7 +1069,7 @@ button.action-button[data-icon=source-term]::before { /* Merged term styles */ -.entry[data-expression-multi=true] .expression-list .expression-details { +:root[data-result-output-mode=merge] .expression-list .expression-details { display: inline-block; position: relative; width: 0; @@ -1077,28 +1077,28 @@ button.action-button[data-icon=source-term]::before { visibility: hidden; z-index: 1; } -.entry[data-expression-multi=true] .expression-list>.expression:not(:last-of-type) .expression-details { +:root[data-result-output-mode=merge] .expression-list>.expression:not(:last-of-type) .expression-details { left: calc(-1 * var(--expression-font-size)); } -.entry[data-expression-multi=true] .expression:hover .expression-details { +:root[data-result-output-mode=merge] .expression:hover .expression-details { visibility: visible; } -.entry[data-expression-multi=true] .expression-list .expression-details>.action-play-audio { +:root[data-result-output-mode=merge] .expression-list .expression-details>.action-play-audio { position: absolute; left: 0; bottom: 0.5em; } -.entry:not([data-expression-multi=true]) .expression-list .expression-details>.action-play-audio { +:root:not([data-result-output-mode=merge]) .expression-list .expression-details>.action-play-audio { display: none; } -.entry[data-expression-multi=true] .expression-list .expression-tag-list { +:root[data-result-output-mode=merge] .expression-list .expression-tag-list { display: block; position: absolute; left: 0; bottom: -0.5em; white-space: nowrap; } -.entry[data-type=term][data-expression-multi=true] .expression-list-tag-list>.tag[data-category=search] { +:root[data-result-output-mode=merge] .entry[data-type=term] .expression-list-tag-list>.tag[data-category=search] { display: none; } diff --git a/ext/js/display/display.js b/ext/js/display/display.js index e564c4ec..65cc579f 100644 --- a/ext/js/display/display.js +++ b/ext/js/display/display.js @@ -819,6 +819,7 @@ class Display extends EventDispatcher { _updateDocumentOptions(options) { const data = document.documentElement.dataset; data.ankiEnabled = `${options.anki.enable}`; + data.resultOutputMode = `${options.general.resultOutputMode}`; data.glossaryLayoutMode = `${options.general.glossaryLayoutMode}`; data.compactTags = `${options.general.compactTags}`; data.frequencyDisplayMode = `${options.general.frequencyDisplayMode}`; |