diff options
| -rw-r--r-- | ext/bg/css/settings2.css | 135 | ||||
| -rw-r--r-- | ext/bg/search.html | 2 | ||||
| -rw-r--r-- | ext/bg/settings2.html | 76 | ||||
| -rw-r--r-- | ext/bg/welcome.html | 6 | ||||
| -rw-r--r-- | ext/mixed/css/search.css | 32 |
5 files changed, 114 insertions, 137 deletions
diff --git a/ext/bg/css/settings2.css b/ext/bg/css/settings2.css index 8ba53b8b..651da9c0 100644 --- a/ext/bg/css/settings2.css +++ b/ext/bg/css/settings2.css @@ -266,6 +266,45 @@ h3 { } +/* Icons */ +.icon { + --icon-image: none; + --icon-size: contain; + -webkit-mask-repeat: no-repeat; + -webkit-mask-position: center center; + -webkit-mask-mode: alpha; + -webkit-mask-size: var(--icon-size); + -webkit-mask-image: var(--icon-image); + mask-repeat: no-repeat; + mask-position: center center; + mask-mode: alpha; + mask-size: var(--icon-size); + mask-image: var(--icon-image); +} +.icon[data-icon=profile] { --icon-image: url(/mixed/img/profile.svg); } +.icon[data-icon=cog] { --icon-image: url(/mixed/img/cog.svg); } +.icon[data-icon=palette] { --icon-image: url(/mixed/img/palette.svg); } +.icon[data-icon=popup] { --icon-image: url(/mixed/img/popup.svg); } +.icon[data-icon=speaker] { --icon-image: url(/mixed/img/speaker.svg); } +.icon[data-icon=scanning] { --icon-image: url(/mixed/img/scanning.svg); } +.icon[data-icon=text-parsing] { --icon-image: url(/mixed/img/text-parsing.svg); } +.icon[data-icon=translation] { --icon-image: url(/mixed/img/translation.svg); } +.icon[data-icon=book] { --icon-image: url(/mixed/img/book.svg); } +.icon[data-icon=note-card] { --icon-image: url(/mixed/img/note-card.svg); } +.icon[data-icon=keyboard] { --icon-image: url(/mixed/img/keyboard.svg); } +.icon[data-icon=backup] { --icon-image: url(/mixed/img/backup.svg); } +.icon[data-icon=lock] { --icon-image: url(/mixed/img/lock.svg); } +.icon[data-icon=question-mark] { --icon-image: url(/mixed/img/question-mark.svg); } +.icon[data-icon=popup-size] { --icon-image: url(/mixed/img/popup-size.svg); } +.icon[data-icon=hamburger-menu] { --icon-image: url(/mixed/img/hamburger-menu.svg); } +.icon[data-icon=kebab-menu] { --icon-image: url(/mixed/img/kebab-menu.svg); } +.icon[data-icon=mouse] { --icon-image: url(/mixed/img/mouse.svg); } +.icon[data-icon=material-down-arrow] { --icon-image: url(/mixed/img/material-down-arrow.svg); } +.icon[data-icon=material-right-arrow] { --icon-image: url(/mixed/img/material-right-arrow.svg); } +.icon[data-icon=exclamation-point-short] { --icon-image: url(/mixed/img/exclamation-point-short.svg); } +.icon[data-icon=magnifying-glass] { --icon-image: url(/mixed/img/magnifying-glass.svg); } + + /* Content layout */ .content-outer { display: flex; @@ -412,7 +451,9 @@ h3 { padding-bottom: 2em; } .outline-item { - display: block; + display: flex; + align-items: center; + width: 100%; height: var(--outline-item-height); line-height: var(--outline-item-height); padding: 0 1.5em; @@ -428,10 +469,6 @@ h3 { .outline-item:hover { background-color: var(--outline-item-background-color-hover); } -.outline-item-inner { - display: flex; - align-items: center; -} .outline-item-left { display: inline-block; width: var(--outline-item-icon-size); @@ -455,8 +492,7 @@ h3 { .outline-item-left-warning-badge:not([hidden]) { display: block; } -.outline-item-left-warning-badge[data-icon]::after { - content: ""; +.outline-item-left-warning-badge>.icon { display: block; position: absolute; left: 0; @@ -464,43 +500,17 @@ h3 { right: 0; bottom: 0; background-color: var(--warning-color); - mask-repeat: no-repeat; - mask-position: center center; - mask-mode: alpha; - -webkit-mask-repeat: no-repeat; - -webkit-mask-position: center center; - -webkit-mask-mode: alpha; -} -.outline-item-left-warning-badge[data-icon=exclamation-point-short]::after { - mask-image: url(/mixed/img/exclamation-point-short.svg); - -webkit-mask-image: url(/mixed/img/exclamation-point-short.svg); - mask-size: 100% 100%; - -webkit-mask-size: 100% 100%; } .outline-item-label { white-space: nowrap; padding-left: var(--padding); } .outline-item-icon { - background-size: contain; - background-color: transparent; - background-repeat: no-repeat; + display: block; + background-color: var(--button-icon-color); + width: 100%; + height: 100%; } -.outline-item-icon[data-icon=profile] { background-image: url(/mixed/img/profile.svg); } -.outline-item-icon[data-icon=general] { background-image: url(/mixed/img/cog.svg); } -.outline-item-icon[data-icon=appearance] { background-image: url(/mixed/img/palette.svg); } -.outline-item-icon[data-icon=popup] { background-image: url(/mixed/img/popup.svg); } -.outline-item-icon[data-icon=audio] { background-image: url(/mixed/img/speaker.svg); } -.outline-item-icon[data-icon=scanning] { background-image: url(/mixed/img/scanning.svg); } -.outline-item-icon[data-icon=text-parsing] { background-image: url(/mixed/img/text-parsing.svg); } -.outline-item-icon[data-icon=translation] { background-image: url(/mixed/img/translation.svg); } -.outline-item-icon[data-icon=dictionaries] { background-image: url(/mixed/img/book.svg); } -.outline-item-icon[data-icon=anki] { background-image: url(/mixed/img/note-card.svg); } -.outline-item-icon[data-icon=shortcuts] { background-image: url(/mixed/img/keyboard.svg); } -.outline-item-icon[data-icon=backup] { background-image: url(/mixed/img/backup.svg); } -.outline-item-icon[data-icon=security] { background-image: url(/mixed/img/lock.svg); } -.outline-item-icon[data-icon=about] { background-image: url(/mixed/img/question-mark.svg); } -.outline-item-icon[data-icon=popup-size] { background-image: url(/mixed/img/popup-size.svg); } /* Preview sidebar */ @@ -1360,7 +1370,7 @@ button.icon-button:active { opacity var(--animation-duration2) ease-in-out, visibility var(--animation-duration2) ease-in-out; } -.icon-button-icon { +.icon-button>.icon-button-inner>.icon { display: block; position: absolute; left: 0; @@ -1368,52 +1378,13 @@ button.icon-button:active { right: 0; bottom: 0; background-color: var(--button-icon-color); - mask-repeat: no-repeat; - mask-position: center center; - mask-mode: alpha; - -webkit-mask-repeat: no-repeat; - -webkit-mask-position: center center; - -webkit-mask-mode: alpha; + --icon-size: 16px 16px; } -.icon-button-icon.icon-button-icon-light { +.icon-button>.icon-button-inner>.icon.icon-button-icon-light { background-color: var(--button-icon-color-light); } -.icon-button-icon[data-icon=right-arrow] { - mask-image: url(/mixed/img/material-right-arrow.svg); - -webkit-mask-image: url(/mixed/img/material-right-arrow.svg); - mask-size: var(--material-arrow-dimension1) var(--material-arrow-dimension2); - -webkit-mask-size: var(--material-arrow-dimension1) var(--material-arrow-dimension2); -} -.icon-button-icon[data-icon=hamburger-menu] { - mask-image: url(/mixed/img/hamburger-menu.svg); - -webkit-mask-image: url(/mixed/img/hamburger-menu.svg); - mask-size: 16px 16px; - -webkit-mask-size: 16px 16px; -} -.icon-button-icon[data-icon=kebab-menu] { - mask-image: url(/mixed/img/kebab-menu.svg); - -webkit-mask-image: url(/mixed/img/kebab-menu.svg); - mask-size: 16px 16px; - -webkit-mask-size: 16px 16px; -} -.icon-button-icon[data-icon=popup] { - mask-image: url(/mixed/img/popup.svg); - -webkit-mask-image: url(/mixed/img/popup.svg); - mask-size: 16px 16px; - -webkit-mask-size: 16px 16px; -} -.icon-button-icon[data-icon=mouse] { - mask-image: url(/mixed/img/mouse.svg); - -webkit-mask-image: url(/mixed/img/mouse.svg); - mask-size: 16px 16px; - -webkit-mask-size: 16px 16px; -} -.icon-button-icon[data-icon=material-down-arrow] { - mask-image: url(/mixed/img/material-down-arrow.svg); - -webkit-mask-image: url(/mixed/img/material-down-arrow.svg); - mask-size: var(--material-arrow-dimension2) var(--material-arrow-dimension1); - -webkit-mask-size: var(--material-arrow-dimension2) var(--material-arrow-dimension1); -} +.icon-button>.icon-button-inner>.icon[data-icon=material-right-arrow] { --icon-size: var(--material-arrow-dimension1) var(--material-arrow-dimension2); } +.icon-button>.icon-button-inner>.icon[data-icon=material-down-arrow] { --icon-size: var(--material-arrow-dimension2) var(--material-arrow-dimension1); } .input-height-icon-button-container { height: var(--input-height); @@ -1806,7 +1777,7 @@ button.fab-button:active { background-color: var(--accent-color); box-shadow: var(--shadow-vertical); } -button.fab-button>.icon-button-inner>.icon-button-icon { +button.fab-button>.icon-button-inner>.icon { background-color: #ffffff; } .fab-container-item.fab-container-item-popup-preview { diff --git a/ext/bg/search.html b/ext/bg/search.html index 34d36478..bcc02578 100644 --- a/ext/bg/search.html +++ b/ext/bg/search.html @@ -46,7 +46,7 @@ </div> <div class="search-textbox-container"> <textarea id="search-textbox" placeholder="Input a term, expression, sentence, or block of text" autocomplete="false" autofocus></textarea> - <button id="search-button"><span class="icon-button-icon" data-icon="magnifying-glass"></span></button> + <button id="search-button"><span class="icon" data-icon="magnifying-glass"></span></button> </div> </div> diff --git a/ext/bg/settings2.html b/ext/bg/settings2.html index 0a591861..0d7483e1 100644 --- a/ext/bg/settings2.html +++ b/ext/bg/settings2.html @@ -21,26 +21,26 @@ <div class="sidebar"><div class="sidebar-inner"> <div class="sidebar-body"> <div class="sidebar-top"><a href="" class="sidebar-top-link" hidden><span class="sidebar-top-icon"></span>Top</a></div> - <a href="#!profile" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="profile"></span><span class="outline-item-label">Profile</span></span></a> - <a href="#!dictionaries" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="dictionaries"><span class="outline-item-left-warning-badge no-dictionaries-installed-warning" data-icon="exclamation-point-short" hidden></span></span><span class="outline-item-label">Dictionaries</span></span></a> - <a href="#!general" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="general"></span><span class="outline-item-label">General</span></span></a> - <a href="#!popup" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="popup"></span><span class="outline-item-label">Popup</span></span></a> - <a href="#!popup-appearance" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="appearance"></span><span class="outline-item-label">Appearance</span></span></a> - <a href="#!popup-size" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="popup-size"></span><span class="outline-item-label">Position & Size</span></span></a> - <a href="#!audio" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="audio"></span><span class="outline-item-label">Audio</span></span></a> - <a href="#!scanning" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="scanning"></span><span class="outline-item-label">Scanning</span></span></a> - <a href="#!text-parsing" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="text-parsing"></span><span class="outline-item-label">Text Parsing</span></span></a> - <a href="#!translation" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="translation"></span><span class="outline-item-label">Translation</span></span></a> - <a href="#!anki" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="anki"></span><span class="outline-item-label">Anki</span></span></a> - <a href="#!shortcuts" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="shortcuts"></span><span class="outline-item-label">Shortcuts</span></span></a> - <a href="#!backup" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="backup"></span><span class="outline-item-label">Backup</span></span></a> - <a href="#!security" class="outline-item advanced-only"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="security"></span><span class="outline-item-label">Security</span></span></a> + <a href="#!profile" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="profile"></span></span><span class="outline-item-label">Profile</span></a> + <a href="#!dictionaries" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="book"></span><span class="outline-item-left-warning-badge no-dictionaries-installed-warning" hidden><span class="icon" data-icon="exclamation-point-short"></span></span></span><span class="outline-item-label">Dictionaries</span></a> + <a href="#!general" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="cog"></span></span><span class="outline-item-label">General</span></a> + <a href="#!popup" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="popup"></span></span><span class="outline-item-label">Popup</span></a> + <a href="#!popup-appearance" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="palette"></span></span><span class="outline-item-label">Appearance</span></a> + <a href="#!popup-size" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="popup-size"></span></span><span class="outline-item-label">Position & Size</span></a> + <a href="#!audio" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="speaker"></span></span><span class="outline-item-label">Audio</span></a> + <a href="#!scanning" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="scanning"></span></span><span class="outline-item-label">Scanning</span></a> + <a href="#!text-parsing" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="text-parsing"></span></span><span class="outline-item-label">Text Parsing</span></a> + <a href="#!translation" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="translation"></span></span><span class="outline-item-label">Translation</span></a> + <a href="#!anki" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="note-card"></span></span><span class="outline-item-label">Anki</span></a> + <a href="#!shortcuts" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="keyboard"></span></span><span class="outline-item-label">Shortcuts</span></a> + <a href="#!backup" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="backup"></span></span><span class="outline-item-label">Backup</span></a> + <a href="#!security" class="outline-item advanced-only"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="lock"></span></span><span class="outline-item-label">Security</span></a> </div> <div class="sidebar-bottom"> - <label class="outline-item"><span class="outline-item-inner"><span class="outline-item-left"> + <label class="outline-item"><span class="outline-item-left"> <label class="toggle"><input id="advanced-checkbox" type="checkbox" data-setting="general.showAdvanced" data-transform="setDocumentAttribute" data-document-attribute="data-advanced"><span class="toggle-body"><span class="toggle-track"></span><span class="toggle-knob"></span></span></label> - </span><span class="outline-item-label">Advanced</span></span></label> - <a href="/bg/info.html" class="outline-item"><span class="outline-item-inner"><span class="outline-item-left outline-item-icon" data-icon="about"></span><span class="outline-item-label">About Yomichan</span></span></a> + </span><span class="outline-item-label">Advanced</span></label> + <a href="/bg/info.html" class="outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="question-mark"></span></span><span class="outline-item-label">About Yomichan</span></a> </div> </div></div> </div> @@ -97,7 +97,7 @@ <div class="settings-item-label">Adjust profiles</div> </div> <div class="settings-item-right open-panel-button-container"> - <button class="icon-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="right-arrow"></span></span></button> + <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button> </div> </div></div> </div> @@ -109,7 +109,7 @@ <div class="settings-item-label">Configure installed and enabled dictionaries</div> </div> <div class="settings-item-right open-panel-button-container"> - <button class="icon-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="right-arrow"></span></span></button> + <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button> </div> </div></div> <div class="settings-item"> @@ -252,7 +252,7 @@ <div class="settings-item-label">Secondary dictionaries</div> </div> <div class="settings-item-right open-panel-button-container"> - <button class="icon-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="right-arrow"></span></span></button> + <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button> </div> </div></div> </div> @@ -564,7 +564,7 @@ <div class="settings-item-label">Custom CSS</div> </div> <div class="settings-item-right open-panel-button-container"> - <button class="icon-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="right-arrow"></span></span></button> + <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button> </div> </div></div> </div> @@ -779,7 +779,7 @@ <div class="settings-item-label">Audio playback sources</div> </div> <div class="settings-item-right open-panel-button-container"> - <button class="icon-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="right-arrow"></span></span></button> + <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button> </div> </div></div> </div> @@ -827,7 +827,7 @@ <div class="settings-item-label">Configure advanced scanning inputs <span class="light no-wrap">(<span class="scanning-input-count">#</span> defined)</span></div> </div> <div class="settings-item-right open-panel-button-container"> - <button class="icon-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="right-arrow"></span></span></button> + <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button> </div> </div></div> <div class="settings-item"> @@ -944,7 +944,7 @@ <div class="settings-item-label">Configure input action prevention</div> </div> <div class="settings-item-right open-panel-button-container"> - <button class="icon-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="right-arrow"></span></span></button> + <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button> </div> </div></div> </div> @@ -1294,7 +1294,7 @@ <div class="settings-item-label">Configure Anki card format</div> </div> <div class="settings-item-right open-panel-button-container"> - <button class="icon-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="right-arrow"></span></span></button> + <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button> </div> </div></div> <div class="settings-item settings-item-button advanced-only" data-modal-action="show,anki-card-templates"><div class="settings-item-inner"> @@ -1302,7 +1302,7 @@ <div class="settings-item-label">Configure Anki card templates</div> </div> <div class="settings-item-right open-panel-button-container"> - <button class="icon-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="right-arrow"></span></span></button> + <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button> </div> </div></div> </div> @@ -1445,10 +1445,10 @@ <div class="fab-container-right"> <div class="fab-container-right-inner1"><div class="fab-container-right-inner2"> <div class="fab-container-item fab-container-item-popup-preview"> - <button class="fab-button icon-button" data-action="toggle-preview-sidebar"><span class="icon-button-inner"><span class="fab-button-background"></span><span class="icon-button-icon" data-icon="popup"></span></span></button> + <button class="fab-button icon-button" data-action="toggle-preview-sidebar"><span class="icon-button-inner"><span class="fab-button-background"></span><span class="icon" data-icon="popup"></span></span></button> </div> <div class="fab-container-item"> - <button class="fab-button icon-button" data-action="toggle-sidebar"><span class="icon-button-inner"><span class="fab-button-background"></span><span class="icon-button-icon" data-icon="hamburger-menu"></span></span></button> + <button class="fab-button icon-button" data-action="toggle-sidebar"><span class="icon-button-inner"><span class="fab-button-background"></span><span class="icon" data-icon="hamburger-menu"></span></span></button> </div> </div></div> </div> @@ -2083,7 +2083,7 @@ <input type="text" id="anki-card-templates-test-text-input" class="form-control" value="読め" placeholder="Preview text" autocomplete="off"> <div class="anki-card-templates-test-input-container"> <input type="text" class="input-with-suffix-button" id="anki-card-templates-test-field-input" value="{expression}" placeholder="{marker}" autocomplete="off" spellcheck="false"> - <button class="input-suffix-button input-suffix-icon-button" id="anki-card-templates-test-field-menu-button" data-menu="anki-card-all-field-menu" data-menu-position="below,left"><span class="icon-button-icon icon-button-icon-light" data-icon="material-down-arrow"></span></button> + <button class="input-suffix-button input-suffix-icon-button" id="anki-card-templates-test-field-menu-button" data-menu="anki-card-all-field-menu" data-menu-position="below,left"><span class="icon icon-button-icon-light" data-icon="material-down-arrow"></span></button> </div> <button id="anki-card-templates-test-render-button">Test</button> </div> @@ -2170,7 +2170,7 @@ <div class="profile-entry-cell"><label class="radio"><input type="radio" class="profile-entry-is-default-radio" name="profile-entry-default-radio"><span class="radio-body"><span class="radio-border"></span><span class="radio-dot"></span></span></label></div> <div class="profile-entry-cell"><input class="profile-entry-name-input" type="text" autocomplete="off" placeholder="Profile name"></div> <div class="profile-entry-cell"><a class="profile-entry-condition-count-link"><span class="profile-entry-condition-count">0</span></a></div> - <div class="profile-entry-cell input-height-icon-button-container"><button class="icon-button profile-entry-menu-button" data-menu="profile-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="kebab-menu"></span></span></button></div> + <div class="profile-entry-cell input-height-icon-button-container"><button class="icon-button profile-entry-menu-button" data-menu="profile-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button></div> </div></template> <template id="profile-condition-group-template"><div class="profile-condition-group"> @@ -2190,12 +2190,12 @@ <div class="profile-condition-input-container"> <input type="text" class="profile-condition-input" autocomplete="off" spellcheck="false"> <div class="input-height-icon-button-container mouse-button-container" hidden> - <button class="icon-button profile-condition-mouse-button mouse-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="mouse"></span></span></button> + <button class="icon-button profile-condition-mouse-button mouse-button"><span class="icon-button-inner"><span class="icon" data-icon="mouse"></span></span></button> </div> </div> </div> <div class="profile-condition-menu-button-container input-height-icon-button-container"> - <button class="icon-button profile-condition-menu-button" data-menu="profile-condition-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="kebab-menu"></span></span></button> + <button class="icon-button profile-condition-menu-button" data-menu="profile-condition-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button> </div> </div></template> @@ -2223,7 +2223,7 @@ </div> </div> <div class="settings-item-right"> - <button class="icon-button dictionary-menu-button" data-menu="dictionary-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="kebab-menu"></span></span></button> + <button class="icon-button dictionary-menu-button" data-menu="dictionary-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button> </div> </div> <div class="settings-item-children"> @@ -2317,7 +2317,7 @@ <option value="custom">Custom</option> </select> <div class="horizontal-flex-fill"></div> - <button class="icon-button audio-source-menu-button" data-menu="audio-source-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="kebab-menu"></span></span></button> + <button class="icon-button audio-source-menu-button" data-menu="audio-source-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button> </div></template> <template id="audio-source-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"> @@ -2331,20 +2331,20 @@ <div class="scan-input-index-cell generic-list-index-prefix"></div> <div class="scan-input-suffix-cell"> <div class="input-height-icon-button-container"> - <button class="icon-button scanning-input-menu-button" data-menu="scanning-inputs-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="kebab-menu"></span></span></button> + <button class="icon-button scanning-input-menu-button" data-menu="scanning-inputs-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button> </div> </div> <div class="scan-input-prefix-cell" data-property="include"><span>Required inputs:</span></div> <div class="scan-input-content-cell" data-property="include"> <input type="text" class="input-with-suffix-button scan-input-field" autocomplete="off" spellcheck="false" placeholder="No inputs" data-property="include"> - <button class="input-suffix-button input-suffix-icon-button mouse-button" data-property="include"><span class="icon-button-icon icon-button-icon-light" data-icon="mouse"></span></button> + <button class="input-suffix-button input-suffix-icon-button mouse-button" data-property="include"><span class="icon icon-button-icon-light" data-icon="mouse"></span></button> </div> <div class="scan-input-prefix-cell" data-property="exclude"><span>Excluded inputs:</span></div> <div class="scan-input-content-cell" data-property="exclude"> <input type="text" class="input-with-suffix-button scan-input-field" autocomplete="off" spellcheck="false" placeholder="No inputs" data-property="exclude"> - <button class="input-suffix-button input-suffix-icon-button mouse-button" data-property="exclude"><span class="icon-button-icon icon-button-icon-light" data-icon="mouse"></span></button> + <button class="input-suffix-button input-suffix-icon-button mouse-button" data-property="exclude"><span class="icon icon-button-icon-light" data-icon="mouse"></span></button> </div> <div class="scan-input-prefix-cell scan-input-options-cell" data-property="types"><span>Input types:</span></div> @@ -2413,7 +2413,7 @@ <template id="anki-card-field-template"><div class="anki-card-field-name-container"><span class="anki-card-field-name"></span></div> <div class="anki-card-field-value-container"> <input type="text" class="anki-card-field-value input-with-suffix-button" autocomplete="off"> - <button class="anki-card-field-value-menu-button input-suffix-button input-suffix-icon-button" data-menu-position="below,left"><span class="icon-button-icon icon-button-icon-light" data-icon="material-down-arrow"></span></button> + <button class="anki-card-field-value-menu-button input-suffix-button input-suffix-icon-button" data-menu-position="below,left"><span class="icon icon-button-icon-light" data-icon="material-down-arrow"></span></button> </div></template> <template id="anki-card-terms-field-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"></div></div></template> diff --git a/ext/bg/welcome.html b/ext/bg/welcome.html index 91c9f84b..acc08438 100644 --- a/ext/bg/welcome.html +++ b/ext/bg/welcome.html @@ -66,7 +66,7 @@ <div class="settings-item-label">Install or remove dictionaries</div> </div> <div class="settings-item-right open-panel-button-container"> - <button class="icon-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="right-arrow"></span></span></button> + <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button> </div> </div></div> </div> @@ -184,7 +184,7 @@ <div class="settings-item-label">View more settings on the Settings page</div> </div> <div class="settings-item-right open-panel-button-container"> - <button class="icon-button"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="right-arrow"></span></span></button> + <button class="icon-button"><span class="icon-button-inner"><span class="icon" data-icon="material-right-arrow"></span></span></button> </div> </div></a> </div> @@ -315,7 +315,7 @@ </div> </div> <div class="settings-item-right"> - <button class="icon-button dictionary-menu-button" data-menu="dictionary-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon-button-icon" data-icon="kebab-menu"></span></span></button> + <button class="icon-button dictionary-menu-button" data-menu="dictionary-menu" data-menu-position="below,left"><span class="icon-button-inner"><span class="icon" data-icon="kebab-menu"></span></span></button> </div> </div> </div></template> diff --git a/ext/mixed/css/search.css b/ext/mixed/css/search.css index 8c8f77e6..ad4a2ae7 100644 --- a/ext/mixed/css/search.css +++ b/ext/mixed/css/search.css @@ -98,6 +98,23 @@ h1 { border-bottom: calc(1em / (var(--font-size-no-units) * 2)) solid var(--separator-color1); } +/* Icons */ +.icon { + --icon-image: none; + --icon-size: contain; + -webkit-mask-repeat: no-repeat; + -webkit-mask-position: center center; + -webkit-mask-mode: alpha; + -webkit-mask-size: var(--icon-size); + -webkit-mask-image: var(--icon-image); + mask-repeat: no-repeat; + mask-position: center center; + mask-mode: alpha; + mask-size: var(--icon-size); + mask-image: var(--icon-image); +} +.icon[data-icon=magnifying-glass] { --icon-image: url(/mixed/img/magnifying-glass.svg); } + /* Material design select */ select { width: var(--input-width-large); @@ -289,7 +306,7 @@ label.toggle { background-color: var(--input-background-color-darker); } -.icon-button-icon { +#search-button>.icon { display: block; position: absolute; left: 0; @@ -297,18 +314,7 @@ label.toggle { right: 0; bottom: 0; background-color: var(--button-icon-color); - mask-repeat: no-repeat; - mask-position: center center; - mask-mode: alpha; - -webkit-mask-repeat: no-repeat; - -webkit-mask-position: center center; - -webkit-mask-mode: alpha; -} -.icon-button-icon[data-icon=magnifying-glass] { - mask-image: url(/mixed/img/magnifying-glass.svg); - -webkit-mask-image: url(/mixed/img/magnifying-glass.svg); - mask-size: 16px 16px; - -webkit-mask-size: 16px 16px; + --icon-size: 16px 16px; } /* Search options */ |