🐛 fix: extra network card mode and overlay setting fixed #42, #43

main
canisminor1990 2023-04-22 19:01:23 +08:00
parent f408718b7e
commit 1784f2d9fb
10 changed files with 86 additions and 74 deletions

View File

@ -1,5 +0,0 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"
npx --no -- commitlint --edit ${1}

View File

@ -1,4 +1,10 @@
#!/bin/sh #!/usr/bin/env sh
# gitmoji as a commit hook # gitmoji as a commit hook
exec < /dev/tty if npx -v >&/dev/null
gitmoji --hook $1 $2 then
exec < /dev/tty
npx -c "gitmoji --hook $1 $2"
else
exec < /dev/tty
gitmoji --hook $1 $2
fi

View File

@ -4,10 +4,9 @@
# [1.5.0](https://github.com/canisminor1990/sd-web-ui-kitchen-theme/compare/v1.4.7...v1.5.0) (2023-04-22) # [1.5.0](https://github.com/canisminor1990/sd-web-ui-kitchen-theme/compare/v1.4.7...v1.5.0) (2023-04-22)
### ✨ Features ### ✨ Features
* add extra network sidebar ([b6dc1f4](https://github.com/canisminor1990/sd-web-ui-kitchen-theme/commit/b6dc1f4)) - add extra network sidebar ([b6dc1f4](https://github.com/canisminor1990/sd-web-ui-kitchen-theme/commit/b6dc1f4))
## [1.4.7](https://github.com/canisminor1990/sd-web-ui-kitchen-theme/compare/v1.4.6...v1.4.7) (2023-04-22) ## [1.4.7](https://github.com/canisminor1990/sd-web-ui-kitchen-theme/compare/v1.4.6...v1.4.7) (2023-04-22)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 KiB

After

Width:  |  Height:  |  Size: 474 KiB

View File

@ -1,3 +0,0 @@
module.exports = {
extends: ['gitmoji'],
}

File diff suppressed because one or more lines are too long

View File

@ -24,14 +24,14 @@
"type-check": "tsc -p tsconfig-check.json" "type-check": "tsc -p tsconfig-check.json"
}, },
"lint-staged": { "lint-staged": {
"*.{less}": [ "*.less": [
"stylelint --fix", "stylelint --fix",
"prettier --write" "prettier --write"
], ],
"*.{json}": [ "*.json": [
"prettier --write --no-error-on-unmatched-pattern" "prettier --write --no-error-on-unmatched-pattern"
], ],
"*.{jsx}": [ "*.jsx": [
"eslint --fix", "eslint --fix",
"prettier --write" "prettier --write"
], ],
@ -54,8 +54,6 @@
"@umijs/lint": "^4.0.66", "@umijs/lint": "^4.0.66",
"antd": "^5.4.2", "antd": "^5.4.2",
"antd-style": "^3.0.0", "antd-style": "^3.0.0",
"commitlint": "^17",
"commitlint-config-gitmoji": "^2",
"concurrently": "^8.0.1", "concurrently": "^8.0.1",
"eslint": "^8", "eslint": "^8",
"eslint-import-resolver-alias": "^1.1.2", "eslint-import-resolver-alias": "^1.1.2",

View File

@ -35,7 +35,7 @@ button#img2img_extra_networks {
} }
} }
.extra-network-subdirs.extra-network-subdirs-thumbs { .extra-network-subdirs {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
gap: 4px; gap: 4px;
@ -60,14 +60,17 @@ button#img2img_extra_networks {
.additional { .additional {
display: none; display: none;
} > ul {
margin: 0;
.additional > ul { padding: 0;
margin: 0; display: flex;
padding: 0; align-items: center;
display: flex; justify-content: center;
align-items: center; a {
justify-content: center; font-size: 15px !important;
margin: 0 !important;
}
}
} }
} }
@ -77,12 +80,20 @@ button#img2img_extra_networks {
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
outline: 1px solid rgb(0 0 0 / 50%); outline: 1px solid rgb(0 0 0 / 50%);
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
overflow: hidden;
.name {
font-size: 12px !important;
}
&:hover { &:hover {
outline: 2px solid var(--color-primary); outline: 2px solid var(--color-primary);
.additional { .additional {
display: block; display: block;
} }
.name {
white-space: unset;
}
} }
} }
@ -97,3 +108,14 @@ button#img2img_extra_networks {
} }
} }
} }
.extra-network-thumbs {
.name {
font-size: 12px !important;
background: transparent;
white-space: nowrap;
overflow: hidden;
display: block;
text-overflow: ellipsis;
}
}

View File

@ -24,11 +24,6 @@
> *:not([id$='_script_container'], #txt2img_seed_row, #mode_img2img) { > *:not([id$='_script_container'], #txt2img_seed_row, #mode_img2img) {
align-items: center; align-items: center;
} }
#img2img_override_settings_row,
#txt2img_override_settings_row {
display: none;
}
} }
#txt2img_gallery { #txt2img_gallery {

File diff suppressed because one or more lines are too long