aboutsummaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2021-01-23 13:48:54 -0500
committerGitHub <noreply@github.com>2021-01-23 13:48:54 -0500
commitca3f9c3648f07480707a3b02e4ad70e3fd0a3d81 (patch)
tree7a75836665c608f0576f343db326a95b180af223 /ext
parenta24f3f5347fdfe528082896c8aa255fc19ac2dd4 (diff)
Update icons (#1295)
* Update icons * Simplify sidebar-button-icon styles
Diffstat (limited to 'ext')
-rw-r--r--ext/fg/float.html8
-rw-r--r--ext/mixed/css/display.css30
-rw-r--r--ext/mixed/css/material.css3
-rw-r--r--ext/mixed/img/checkmark.svg1
-rw-r--r--ext/mixed/img/cross.svg2
5 files changed, 11 insertions, 33 deletions
diff --git a/ext/fg/float.html b/ext/fg/float.html
index 505bce81..c361c9eb 100644
--- a/ext/fg/float.html
+++ b/ext/fg/float.html
@@ -66,14 +66,14 @@
<div class="content-sidebar scrollbar" id="content-sidebar">
<div class="content-sidebar-inner">
<div class="content-sidebar-top-pre">
- <button class="sidebar-button danger" id="close-button" title="Close popup" data-hotkey='["close","title","Close popup ({0})"]'><span class="sidebar-button-icon" data-icon="cross"></span></button>
+ <button class="sidebar-button danger" id="close-button" title="Close popup" data-hotkey='["close","title","Close popup ({0})"]'><span class="sidebar-button-icon icon" data-icon="cross"></span></button>
</div>
<div class="content-sidebar-top">
- <button class="sidebar-button" disabled id="navigate-previous-button" title="Previous definition" data-hotkey='["historyBackward","title","Previous definition ({0})"]'><span class="sidebar-button-icon" data-icon="left-chevron"></span></button>
- <button class="sidebar-button" disabled id="navigate-next-button" title="Next definition" data-hotkey='["historyForward","title","Next definition ({0})"]'><span class="sidebar-button-icon" data-icon="right-chevron"></span></button>
+ <button class="sidebar-button" disabled id="navigate-previous-button" title="Previous definition" data-hotkey='["historyBackward","title","Previous definition ({0})"]'><span class="sidebar-button-icon icon" data-icon="left-chevron"></span></button>
+ <button class="sidebar-button" disabled id="navigate-next-button" title="Next definition" data-hotkey='["historyForward","title","Next definition ({0})"]'><span class="sidebar-button-icon icon" data-icon="right-chevron"></span></button>
</div>
<div class="content-sidebar-bottom">
- <button class="sidebar-button" id="profile-button"><span class="sidebar-button-icon" data-icon="profile"></span></button>
+ <button class="sidebar-button" id="profile-button"><span class="sidebar-button-icon icon" data-icon="profile"></span></button>
</div>
</div>
</div>
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index a7c3e368..0c6ab336 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -494,17 +494,11 @@ button.sidebar-button.danger:active:not(:disabled) {
background-color: var(--sidebar-button-danger-background-color-active);
}
.sidebar-button-icon {
+ --icon-size: var(--sidebar-button-icon-size) var(--sidebar-button-icon-size);
+
display: block;
width: 100%;
height: 100%;
- mask-repeat: no-repeat;
- mask-position: center center;
- mask-mode: alpha;
- mask-size: var(--sidebar-button-icon-size) var(--sidebar-button-icon-size);
- -webkit-mask-repeat: no-repeat;
- -webkit-mask-position: center center;
- -webkit-mask-mode: alpha;
- -webkit-mask-size: var(--sidebar-button-icon-size) var(--sidebar-button-icon-size);
background-color: var(--sidebar-button-icon-color);
transition: background-color 0.125s ease-in-out;
}
@@ -518,26 +512,6 @@ button.sidebar-button.danger:focus .sidebar-button-icon {
button.sidebar-button.sidebar-button-highlight>.sidebar-button-icon {
background-color: var(--accent-color);
}
-.sidebar-button-icon[data-icon=cross] {
- mask-image: url(/mixed/img/cross.svg);
- -webkit-mask-image: url(/mixed/img/cross.svg);
-}
-.sidebar-button-icon[data-icon=left-chevron] {
- mask-image: url(/mixed/img/left-chevron.svg);
- -webkit-mask-image: url(/mixed/img/left-chevron.svg);
-}
-.sidebar-button-icon[data-icon=right-chevron] {
- mask-image: url(/mixed/img/right-chevron.svg);
- -webkit-mask-image: url(/mixed/img/right-chevron.svg);
-}
-.sidebar-button-icon[data-icon=kebab-menu] {
- mask-image: url(/mixed/img/kebab-menu.svg);
- -webkit-mask-image: url(/mixed/img/kebab-menu.svg);
-}
-.sidebar-button-icon[data-icon=profile] {
- mask-image: url(/mixed/img/profile.svg);
- -webkit-mask-image: url(/mixed/img/profile.svg);
-}
/* Search page */
diff --git a/ext/mixed/css/material.css b/ext/mixed/css/material.css
index 259d6460..6846c187 100644
--- a/ext/mixed/css/material.css
+++ b/ext/mixed/css/material.css
@@ -196,10 +196,13 @@
.icon[data-icon=expand] { --icon-image: url(/mixed/img/expand.svg); }
.icon[data-icon=window] { --icon-image: url(/mixed/img/window.svg); }
.icon[data-icon=cross] { --icon-image: url(/mixed/img/cross.svg); }
+.icon[data-icon=checkmark] { --icon-image: url(/mixed/img/checkmark.svg); }
.icon[data-icon=sentence-parsing] { --icon-image: url(/mixed/img/sentence-parsing.svg); }
.icon[data-icon=question-mark] { --icon-image: url(/mixed/img/question-mark.svg); }
.icon[data-icon=question-mark-circle] { --icon-image: url(/mixed/img/question-mark-circle.svg); }
.icon[data-icon=question-mark-thick] { --icon-image: url(/mixed/img/question-mark-thick.svg); }
+.icon[data-icon=left-chevron] { --icon-image: url(/mixed/img/left-chevron.svg); }
+.icon[data-icon=right-chevron] { --icon-image: url(/mixed/img/right-chevron.svg); }
.icon[data-icon=material-down-arrow] {
--icon-image: url(/mixed/img/material-down-arrow.svg);
--icon-size: var(--material-arrow-dimension2) var(--material-arrow-dimension1);
diff --git a/ext/mixed/img/checkmark.svg b/ext/mixed/img/checkmark.svg
new file mode 100644
index 00000000..14504166
--- /dev/null
+++ b/ext/mixed/img/checkmark.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M6.5 13l8-8-2-2-6 6-3-3-2 2z"/></svg> \ No newline at end of file
diff --git a/ext/mixed/img/cross.svg b/ext/mixed/img/cross.svg
index 9b3d6a5c..9ea89e51 100644
--- a/ext/mixed/img/cross.svg
+++ b/ext/mixed/img/cross.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M3.5605 1.4395L1.4394 3.5606l4.4395 4.4395-4.4395 4.4395 2.1211 2.1211L8 10.1212l4.1895 4.4395 2.1211-2.1211-4.1895-4.4395 4.1895-4.4395-2.1211-2.1211L8 5.879z" fill="#333"/></svg> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M1.5 3.5l2-2L8 6l4.5-4.5 2 2L10 8l4.5 4.5-2 2L8 10l-4.5 4.5-2-2L6 8z"/></svg> \ No newline at end of file