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 @@
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 @@ + \ 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 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/icons.svg b/resources/icons.svg index 59723730..5d5ac89e 100644 --- a/resources/icons.svg +++ b/resources/icons.svg @@ -27,11 +27,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="-0.96137572" - inkscape:cy="5.5332057" + inkscape:zoom="32" + inkscape:cx="10.107295" + inkscape:cy="8.7280255" inkscape:document-units="px" - inkscape:current-layer="g1184" + inkscape:current-layer="layer41" showgrid="true" units="px" inkscape:snap-center="true" @@ -532,7 +532,7 @@