diff options
| author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2020-11-08 12:34:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-08 12:34:23 -0500 |
| commit | 8cf10d685d52d5ae75d65c4aea4adcb6d101e9a4 (patch) | |
| tree | 3a1874942370917e328976854c5a5c7352d9e085 /ext/fg | |
| parent | db9ec4c4495404ad3ebc9ce56866c3631cedf8dc (diff) | |
Search and display style updates (#1005)
* Use same selectors
* Use consistent stylesheet declaration
* Fix query parser not being cleared
* Set property upon load
* Don't focus for Enter key press
* Update search page styles
* Update indent and nodes
* Support dark style
* Add missing var
Diffstat (limited to 'ext/fg')
| -rw-r--r-- | ext/fg/float.html | 131 | ||||
| -rw-r--r-- | ext/fg/js/float.js | 2 |
2 files changed, 67 insertions, 66 deletions
diff --git a/ext/fg/float.html b/ext/fg/float.html index 4a7cb616..d5172145 100644 --- a/ext/fg/float.html +++ b/ext/fg/float.html @@ -1,80 +1,81 @@ <!DOCTYPE html> <html lang="en" data-yomichan-page="float"> - <head> - <meta charset="UTF-8"> - <meta name="viewport" content="width=device-width,initial-scale=1" /> - <title>Yomichan Search</title> - <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16"> - <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19"> - <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32"> - <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38"> - <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48"> - <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64"> - <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128"> - <link rel="stylesheet" href="/mixed/css/display.css"> - </head> - <body> - <div id="spinner" hidden><img src="/mixed/img/spinner.gif"></div> +<head> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width,initial-scale=1"> + <title>Yomichan Search</title> + <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16"> + <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19"> + <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32"> + <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38"> + <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48"> + <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64"> + <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128"> + <link rel="stylesheet" type="text/css" href="/mixed/css/display.css"> +</head> +<body> - <div id="navigation-header" class="navigation-header" hidden><div class="navigation-header-actions"> - <button class="action-button action-previous" data-icon="source-term" title="Source term (Alt + B)"></button> - <button class="action-button action-next" data-icon="source-term" title="Next term (Alt + F)"></button> - </div></div><div class="navigation-header-spacer"></div> + <div id="spinner" hidden><img src="/mixed/img/spinner.gif"></div> - <div class="scan-disable" id="query-parser-container" hidden> - <div id="query-parser-select-container" class="input-group"></div> - <div id="query-parser-content"></div> - </div> + <div id="navigation-header" class="navigation-header" hidden><div class="navigation-header-actions"> + <button class="action-button action-previous" data-icon="source-term" title="Source term (Alt + B)"></button> + <button class="action-button action-next" data-icon="source-term" title="Next term (Alt + F)"></button> + </div></div><div class="navigation-header-spacer"></div> + + <div class="scan-disable" id="query-parser-container" hidden> + <div id="query-parser-select-container" class="input-group"></div> + <div id="query-parser-content"></div> + </div> - <div id="definitions"></div> + <div id="definitions"></div> - <div id="no-results" hidden> - <div class="entry"> - <p>No results found.</p> - </div> + <div id="no-results" hidden> + <div class="entry"> + <p>No results found.</p> </div> + </div> - <div id="error-extension-unloaded" hidden> - <div class="entry"> - <h1>Yomichan Updated!</h1> - <p> - The Yomichan extension has been updated to a new version! In order to continue - viewing definitions on this page, you must reload this tab or restart your browser. - </p> - </div> + <div id="error-extension-unloaded" hidden> + <div class="entry"> + <h1>Yomichan Updated!</h1> + <p> + The Yomichan extension has been updated to a new version! In order to continue + viewing definitions on this page, you must reload this tab or restart your browser. + </p> </div> + </div> - <script src="/mixed/js/core.js"></script> - <script src="/mixed/js/yomichan.js"></script> - <script src="/mixed/js/comm.js"></script> - <script src="/mixed/js/api.js"></script> - <script src="/mixed/js/japanese.js"></script> +<script src="/mixed/js/core.js"></script> +<script src="/mixed/js/yomichan.js"></script> +<script src="/mixed/js/comm.js"></script> +<script src="/mixed/js/api.js"></script> +<script src="/mixed/js/japanese.js"></script> - <script src="/mixed/js/cache-map.js"></script> - <script src="/mixed/js/document-util.js"></script> - <script src="/fg/js/dom-text-scanner.js"></script> - <script src="/fg/js/text-source-range.js"></script> - <script src="/fg/js/text-source-element.js"></script> - <script src="/mixed/js/audio-system.js"></script> - <script src="/mixed/js/dictionary-data-util.js"></script> - <script src="/mixed/js/display.js"></script> - <script src="/mixed/js/display-generator.js"></script> - <script src="/mixed/js/display-history.js"></script> - <script src="/mixed/js/dynamic-loader.js"></script> - <script src="/mixed/js/frame-endpoint.js"></script> - <script src="/mixed/js/media-loader.js"></script> - <script src="/mixed/js/scroll.js"></script> - <script src="/mixed/js/text-scanner.js"></script> - <script src="/mixed/js/html-template-collection.js"></script> - <script src="/mixed/js/text-to-speech-audio.js"></script> +<script src="/mixed/js/cache-map.js"></script> +<script src="/mixed/js/document-util.js"></script> +<script src="/fg/js/dom-text-scanner.js"></script> +<script src="/fg/js/text-source-range.js"></script> +<script src="/fg/js/text-source-element.js"></script> +<script src="/mixed/js/audio-system.js"></script> +<script src="/mixed/js/dictionary-data-util.js"></script> +<script src="/mixed/js/display.js"></script> +<script src="/mixed/js/display-generator.js"></script> +<script src="/mixed/js/display-history.js"></script> +<script src="/mixed/js/dynamic-loader.js"></script> +<script src="/mixed/js/frame-endpoint.js"></script> +<script src="/mixed/js/media-loader.js"></script> +<script src="/mixed/js/scroll.js"></script> +<script src="/mixed/js/text-scanner.js"></script> +<script src="/mixed/js/html-template-collection.js"></script> +<script src="/mixed/js/text-to-speech-audio.js"></script> - <script src="/bg/js/anki-note-builder.js"></script> - <script src="/bg/js/template-renderer-proxy.js"></script> +<script src="/bg/js/anki-note-builder.js"></script> +<script src="/bg/js/template-renderer-proxy.js"></script> - <script src="/bg/js/query-parser-generator.js"></script> - <script src="/bg/js/query-parser.js"></script> - <script src="/fg/js/float.js"></script> +<script src="/bg/js/query-parser-generator.js"></script> +<script src="/bg/js/query-parser.js"></script> +<script src="/fg/js/float.js"></script> - <script src="/fg/js/float-main.js"></script> - </body> +<script src="/fg/js/float-main.js"></script> +</body> </html> diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js index bfa2195e..7a6cae64 100644 --- a/ext/fg/js/float.js +++ b/ext/fg/js/float.js @@ -23,7 +23,7 @@ class DisplayFloat extends Display { constructor() { - super(document.querySelector('#spinner'), document.querySelector('#definitions')); + super(); this._nestedPopupsPrepared = false; this._frameEndpoint = new FrameEndpoint(); this._windowMessageHandlers = new Map([ |