Skip to content

Commit

Permalink
🐛 fix: extra network card mode and overlay setting fixed #42, #43
Browse files Browse the repository at this point in the history
  • Loading branch information
canisminor1990 committed Apr 22, 2023
1 parent f408718 commit 1784f2d
Show file tree
Hide file tree
Showing 10 changed files with 86 additions and 74 deletions.
5 changes: 0 additions & 5 deletions .husky/commit-msg

This file was deleted.

12 changes: 9 additions & 3 deletions .husky/prepare-commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#!/bin/sh
#!/usr/bin/env sh
# gitmoji as a commit hook
exec < /dev/tty
gitmoji --hook $1 $2
if npx -v >&/dev/null
then
exec < /dev/tty
npx -c "gitmoji --hook $1 $2"
else
exec < /dev/tty
gitmoji --hook $1 $2
fi
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


### ✨ 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)

Expand Down
Binary file modified assets/screenshot.webp
Binary file not shown.
3 changes: 0 additions & 3 deletions commitlint.config.js

This file was deleted.

82 changes: 41 additions & 41 deletions javascript/index.js

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"type-check": "tsc -p tsconfig-check.json"
},
"lint-staged": {
"*.{less}": [
"*.less": [
"stylelint --fix",
"prettier --write"
],
"*.{json}": [
"*.json": [
"prettier --write --no-error-on-unmatched-pattern"
],
"*.{jsx}": [
"*.jsx": [
"eslint --fix",
"prettier --write"
],
Expand All @@ -54,8 +54,6 @@
"@umijs/lint": "^4.0.66",
"antd": "^5.4.2",
"antd-style": "^3.0.0",
"commitlint": "^17",
"commitlint-config-gitmoji": "^2",
"concurrently": "^8.0.1",
"eslint": "^8",
"eslint-import-resolver-alias": "^1.1.2",
Expand Down
40 changes: 31 additions & 9 deletions src/theme/components/extra-network.less
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ button#img2img_extra_networks {
}
}

.extra-network-subdirs.extra-network-subdirs-thumbs {
.extra-network-subdirs {
display: flex;
flex-wrap: wrap;
gap: 4px;
Expand All @@ -60,14 +60,17 @@ button#img2img_extra_networks {

.additional {
display: none;
}

.additional > ul {
margin: 0;
padding: 0;
display: flex;
align-items: center;
justify-content: center;
> ul {
margin: 0;
padding: 0;
display: flex;
align-items: center;
justify-content: center;
a {
font-size: 15px !important;
margin: 0 !important;
}
}
}
}

Expand All @@ -77,12 +80,20 @@ button#img2img_extra_networks {
box-shadow: var(--box-shadow);
outline: 1px solid rgb(0 0 0 / 50%);
transition: all 0.2s ease-in-out;
overflow: hidden;

.name {
font-size: 12px !important;
}

&:hover {
outline: 2px solid var(--color-primary);
.additional {
display: block;
}
.name {
white-space: unset;
}
}
}

Expand All @@ -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;
}
}
5 changes: 0 additions & 5 deletions src/theme/tabs/tab-to-img.less
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
> *:not([id$='_script_container'], #txt2img_seed_row, #mode_img2img) {
align-items: center;
}

#img2img_override_settings_row,
#txt2img_override_settings_row {
display: none;
}
}

#txt2img_gallery {
Expand Down
2 changes: 1 addition & 1 deletion style.css

Large diffs are not rendered by default.

0 comments on commit 1784f2d

Please sign in to comment.