Merge branch 'testing' into main

This commit is contained in:
tim h 2022-12-18 17:57:38 -06:00
commit 5732a778fa
13 changed files with 60 additions and 60 deletions

View file

@ -1,4 +1,4 @@
@font-face {
font-family: "Open Sans", sans-serif;
src: url("/res/fonts/OpenSans.ttf") format("truetype");
src: url("../res/fonts/OpenSans.ttf") format("truetype");
}

View file

@ -1,44 +1,44 @@
.ui.icon > .icon-eye-off {
-webkit-mask-image: url("/res/icons/eye-off.svg");
mask-image: url("/res/icons/eye-off.svg");
-webkit-mask-image: url("../res/icons/eye-off.svg");
mask-image: url("../res/icons/eye-off.svg");
}
.ui.icon > .icon-eye {
-webkit-mask-image: url("/res/icons/eye.svg");
mask-image: url("/res/icons/eye.svg");
-webkit-mask-image: url("../res/icons/eye.svg");
mask-image: url("../res/icons/eye.svg");
}
.ui.icon > .icon-file-plus {
-webkit-mask-image: url("/res/icons/file-plus.svg");
mask-image: url("/res/icons/file-plus.svg");
-webkit-mask-image: url("../res/icons/file-plus.svg");
mask-image: url("../res/icons/file-plus.svg");
}
.ui.icon > .icon-file-x {
-webkit-mask-image: url("/res/icons/file-x.svg");
mask-image: url("/res/icons/file-x.svg");
-webkit-mask-image: url("../res/icons/file-x.svg");
mask-image: url("../res/icons/file-x.svg");
}
.ui.icon > .icon-chevron-down {
-webkit-mask-image: url("/res/icons/chevron-down.svg");
mask-image: url("/res/icons/chevron-down.svg");
-webkit-mask-image: url("../res/icons/chevron-down.svg");
mask-image: url("../res/icons/chevron-down.svg");
}
.ui.icon > .icon-chevron-up {
-webkit-mask-image: url("/res/icons/chevron-up.svg");
mask-image: url("/res/icons/chevron-up.svg");
-webkit-mask-image: url("../res/icons/chevron-up.svg");
mask-image: url("../res/icons/chevron-up.svg");
}
.ui.icon > .icon-chevron-first {
-webkit-mask-image: url("/res/icons/chevron-first.svg");
mask-image: url("/res/icons/chevron-first.svg");
-webkit-mask-image: url("../res/icons/chevron-first.svg");
mask-image: url("../res/icons/chevron-first.svg");
}
.ui.icon > .icon-chevron-flat-down {
-webkit-mask-image: url("/res/icons/chevron-first.svg");
mask-image: url("/res/icons/chevron-first.svg");
-webkit-mask-image: url("../res/icons/chevron-first.svg");
mask-image: url("../res/icons/chevron-first.svg");
transform: rotate(-90deg);
}
.ui.icon > .icon-settings {
-webkit-mask-image: url("/res/icons/settings.svg");
mask-image: url("/res/icons/settings.svg");
-webkit-mask-image: url("../res/icons/settings.svg");
mask-image: url("../res/icons/settings.svg");
}

View file

@ -55,8 +55,8 @@ body {
height: 21px;
background-color: var(--c-text);
mask-image: url("/res/icons/chevron-up.svg");
-webkit-mask-image: url("/res/icons/chevron-up.svg");
mask-image: url("../res/icons/chevron-up.svg");
-webkit-mask-image: url("../res/icons/chevron-up.svg");
mask-size: contain;
-webkit-mask-size: contain;
rotate: 90deg;
@ -154,8 +154,8 @@ body {
width: 25px;
height: 25px;
-webkit-mask-image: url("/res/icons/x.svg");
mask-image: url("/res/icons/x.svg");
-webkit-mask-image: url("../res/icons/x.svg");
mask-image: url("../res/icons/x.svg");
background-color: var(--c-text);
}
@ -423,18 +423,18 @@ div.prompt-wrapper > .prompt-indicator::after {
}
div.prompt-wrapper > .prompt-indicator.positive::after {
mask-image: url("/res/icons/plus-square.svg");
-webkit-mask-image: url("/res/icons/plus-square.svg");
mask-image: url("../res/icons/plus-square.svg");
-webkit-mask-image: url("../res/icons/plus-square.svg");
}
div.prompt-wrapper > .prompt-indicator.negative::after {
mask-image: url("/res/icons/minus-square.svg");
-webkit-mask-image: url("/res/icons/minus-square.svg");
mask-image: url("../res/icons/minus-square.svg");
-webkit-mask-image: url("../res/icons/minus-square.svg");
}
div.prompt-wrapper > .prompt-indicator.styles::after {
mask-image: url("/res/icons/library.svg");
-webkit-mask-image: url("/res/icons/library.svg");
mask-image: url("../res/icons/library.svg");
-webkit-mask-image: url("../res/icons/library.svg");
}
.prompt-history-wrapper {
@ -561,8 +561,8 @@ button.prompt-history-btn::after {
mask-size: contain;
-webkit-mask-size: contain;
mask-image: url("/res/icons/history.svg");
-webkit-mask-image: url("/res/icons/history.svg");
mask-image: url("../res/icons/history.svg");
-webkit-mask-image: url("../res/icons/history.svg");
}
button.prompt-history-btn:hover {

View file

@ -157,9 +157,9 @@ div.autocomplete > .autocomplete-list > .autocomplete-option.selected::after {
background-color: darkgreen;
-webkit-mask-image: url("/res/icons/check.svg");
-webkit-mask-image: url("../../res/icons/check.svg");
-webkit-mask-size: contain;
mask-image: url("/res/icons/check.svg");
mask-image: url("../../res/icons/check.svg");
mask-size: contain;
}
@ -176,9 +176,9 @@ select > option:checked::after {
background-color: darkgreen;
-webkit-mask-image: url("/res/icons/check.svg");
-webkit-mask-image: url("../../res/icons/check.svg");
-webkit-mask-size: contain;
mask-image: url("/res/icons/check.svg");
mask-image: url("../../res/icons/check.svg");
mask-size: contain;
}
/*************/
@ -332,16 +332,16 @@ select > option:checked::after {
/* Generic buttons */
.list .actions > .delete-btn > *:first-child {
-webkit-mask-image: url("/res/icons/trash.svg");
mask-image: url("/res/icons/trash.svg");
-webkit-mask-image: url("../../res/icons/trash.svg");
mask-image: url("../../res/icons/trash.svg");
}
.list .actions > .rename-btn > *:first-child {
-webkit-mask-image: url("/res/icons/edit.svg");
mask-image: url("/res/icons/edit.svg");
-webkit-mask-image: url("../../res/icons/edit.svg");
mask-image: url("../../res/icons/edit.svg");
}
.list .actions > .download-btn > *:first-child {
-webkit-mask-image: url("/res/icons/download.svg");
mask-image: url("/res/icons/download.svg");
-webkit-mask-image: url("../../res/icons/download.svg");
mask-image: url("../../res/icons/download.svg");
}

View file

@ -99,22 +99,22 @@
}
#layer-list .actions > .rename-btn > *:first-child {
-webkit-mask-image: url("/res/icons/edit.svg");
mask-image: url("/res/icons/edit.svg");
-webkit-mask-image: url("../../res/icons/edit.svg");
mask-image: url("../../res/icons/edit.svg");
}
#layer-list .actions > .delete-btn > *:first-child {
-webkit-mask-image: url("/res/icons/trash.svg");
mask-image: url("/res/icons/trash.svg");
-webkit-mask-image: url("../../res/icons/trash.svg");
mask-image: url("../../res/icons/trash.svg");
}
#layer-list .actions > .hide-btn > *:first-child {
-webkit-mask-image: url("/res/icons/eye.svg");
mask-image: url("/res/icons/eye.svg");
-webkit-mask-image: url("../../res/icons/eye.svg");
mask-image: url("../../res/icons/eye.svg");
}
#layer-list .hidden .actions > .hide-btn > *:first-child {
-webkit-mask-image: url("/res/icons/eye-off.svg");
mask-image: url("/res/icons/eye-off.svg");
-webkit-mask-image: url("../../res/icons/eye-off.svg");
mask-image: url("../../res/icons/eye-off.svg");
}
.layer-manager > .separator {
@ -158,7 +158,7 @@
background-color: #293d3d77;
mask-image: url("/res/icons/chevron-up.svg");
mask-image: url("../../res/icons/chevron-up.svg");
mask-size: contain;
width: 60px;

View file

@ -35,7 +35,7 @@
border: 0;
background-image: url("/res/icons/pipette.svg");
background-image: url("./res/icons/pipette.svg");
background-repeat: no-repeat;
background-position: center;
background-size: contain;

View file

@ -51,9 +51,9 @@
background-color: red;
-webkit-mask-image: url("/res/icons/lock.svg");
-webkit-mask-image: url("../../res/icons/lock.svg");
-webkit-mask-size: contain;
mask-image: url("/res/icons/lock.svg");
mask-image: url("../../res/icons/lock.svg");
mask-size: contain;
}

View file

@ -37,7 +37,7 @@ const _color_brush_erase_callback = (evn, state, ctx) => {
const colorBrushTool = () =>
toolbar.registerTool(
"/res/icons/brush.svg",
"./res/icons/brush.svg",
"Color Brush",
(state, opt) => {
// Draw new cursor immediately

View file

@ -1071,7 +1071,7 @@ const _dream_onwheel = (evn, state) => {
*/
const dreamTool = () =>
toolbar.registerTool(
"/res/icons/image-plus.svg",
"./res/icons/image-plus.svg",
"Dream",
(state, opt) => {
// Draw new cursor immediately
@ -1426,7 +1426,7 @@ const dreamTool = () =>
const img2imgTool = () =>
toolbar.registerTool(
"/res/icons/image.svg",
"./res/icons/image.svg",
"Img2Img",
(state, opt) => {
// Draw new cursor immediately

View file

@ -1,6 +1,6 @@
const interrogateTool = () =>
toolbar.registerTool(
"/res/icons/microscope.svg",
"./res/icons/microscope.svg",
"Interrogate",
(state, opt) => {
// Draw new cursor immediately

View file

@ -61,7 +61,7 @@ const _mask_brush_erase_callback = (evn, state, opacity = 100) => {
const maskBrushTool = () =>
toolbar.registerTool(
"/res/icons/paintbrush.svg",
"./res/icons/paintbrush.svg",
"Mask Brush",
(state, opt) => {
// Draw new cursor immediately

View file

@ -1,6 +1,6 @@
const selectTransformTool = () =>
toolbar.registerTool(
"/res/icons/box-select.svg",
"./res/icons/box-select.svg",
"Select Image",
(state, opt) => {
// Draw new cursor immediately

View file

@ -1,6 +1,6 @@
const stampTool = () =>
toolbar.registerTool(
"/res/icons/file-up.svg",
"./res/icons/file-up.svg",
"Stamp Image",
(state, opt) => {
state.loaded = true;