diff --git a/CHANGELOG.md b/CHANGELOG.md index 22c48e76c..2c7342617 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -169,6 +169,7 @@ For details, see [ChangeLog](https://github.com/vladmandic/automatic/blob/master - fix prompt encoding if prompts within batch have different segment counts - fix detailer min/max size - fix loopback script + - fix networks tags display - fix yolo refresh models - cleanup control infotext - allow upscaling with models that have implicit VAE processing diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index 9e204cf5c..e51d35da7 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit 9e204cf5c2c79543f9d2cc5c6d354c62ce0b45ac +Subproject commit e51d35da7ceb4b01d733a46850a434cc56975af6 diff --git a/javascript/base.css b/javascript/base.css index 85fd965b3..75ca46f55 100644 --- a/javascript/base.css +++ b/javascript/base.css @@ -98,11 +98,11 @@ table.settings-value-table td { padding: 0.4em; border: 1px solid #ccc; max-widt .extra-network-cards .card:hover .overlay { background: rgba(0, 0, 0, 0.40); } .extra-network-cards .card:hover .preview { box-shadow: none; filter: grayscale(100%); } .extra-network-cards .card:hover .overlay { background: rgba(0, 0, 0, 0.40); } -.extra-network-cards .card .overlay .tags { margin: 4px; display: none; overflow-wrap: break-word; } -.extra-network-cards .card .overlay .tag { padding: 2px; margin: 2px; background: var(--neutral-700); cursor: pointer; display: inline-block; } +.extra-network-cards .card .tags { margin: 4px; display: none; overflow-wrap: break-word; } +.extra-network-cards .card .tag { padding: 2px; margin: 2px; background: var(--neutral-700); cursor: pointer; display: inline-block; } .extra-network-cards .card .actions > span { padding: 4px; } .extra-network-cards .card:hover .actions { display: block; } -.extra-network-cards .card:hover .overlay .tags { display: block; } +.extra-network-cards .card:hover .tags { display: block; } .extra-network-cards .card .actions { font-size: 3em; display: none; text-align-last: right; cursor: pointer; font-variant: unicase; position: absolute; z-index: 100; right: 0; height: 0.7em; width: 100%; background: rgba(0, 0, 0, 0.40); } #txt2img_description, #img2img_description, #control_description, #video_description { max-height: 63px; overflow-y: auto !important; } #txt2img_description>label>textarea, #img2img_description>label>textarea, #control_description>label>textarea, #video_description>label>textarea { font-size: 0.9em } diff --git a/javascript/black-teal-reimagined.css b/javascript/black-teal-reimagined.css index c803c6d97..3f1cdf9a9 100644 --- a/javascript/black-teal-reimagined.css +++ b/javascript/black-teal-reimagined.css @@ -900,7 +900,7 @@ svg.feather.feather-image, } /* Tags Styles */ -.extra-network-cards .card .overlay .tags { +.extra-network-cards .card .tags { display: none; overflow-wrap: anywhere; position: absolute; @@ -913,7 +913,7 @@ svg.feather.feather-image, } /* Individual Tag Styles */ -.extra-network-cards .card .overlay .tag { +.extra-network-cards .card .tag { padding: 2px; margin: 2px; background: rgba(70, 70, 70, 0.60); @@ -961,7 +961,7 @@ svg.feather.feather-image, display: block; } -.extra-network-cards .card:hover .overlay .tags { +.extra-network-cards .card:hover .tags { display: block; } diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js index 44e982e42..1a9ae4fe6 100644 --- a/javascript/extraNetworks.js +++ b/javascript/extraNetworks.js @@ -101,7 +101,6 @@ function readCardDescription(page, item) { const description = gradioApp().querySelector(`#${tabname}_description > label > textarea`); if (description) { description.value = data?.description?.trim() || ''; - // description.focus(); updateInput(description); } setENState({ op: 'readCardDescription', page, item }); diff --git a/javascript/sdnext.css b/javascript/sdnext.css index 07101e7fe..7eacd1978 100644 --- a/javascript/sdnext.css +++ b/javascript/sdnext.css @@ -1194,8 +1194,9 @@ table.settings-value-table td { filter: grayscale(100%); } -.extra-network-cards .card .overlay .tags { - background: var(--body-background-fill); +.extra-network-cards .card .tags { + background: var(--background-fill-primary); + opacity: 0.95; display: none; max-height: 333px; overflow-wrap: anywhere; @@ -1206,11 +1207,11 @@ table.settings-value-table td { z-index: 20; } -.extra-network-cards .card .overlay .tag { - background: rgba(70, 70, 70, 0.60); +.extra-network-cards .card .tag { + background: var(--button-primary-background-fill-hover); cursor: pointer; display: inline-block; - font-size: var(--text-md); + font-size: 0.9em !important; margin: 2px; padding: 2px; } @@ -1242,7 +1243,7 @@ table.settings-value-table td { display: block; } -.extra-network-cards .card:hover .overlay .tags { +.extra-network-cards .card:hover .tags { display: block; } diff --git a/modules/shared.py b/modules/shared.py index 4a5ceb4c1..60bc59da1 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -708,7 +708,7 @@ options_templates.update(options_section(('extra_networks', "Networks"), { "extra_networks_card_cover": OptionInfo("sidebar", "UI position", gr.Radio, {"choices": ["cover", "inline", "sidebar"]}), "extra_networks_height": OptionInfo(0, "UI height (%)", gr.Slider, {"minimum": 0, "maximum": 100, "step": 1}), # set in ui_javascript "extra_networks_sidebar_width": OptionInfo(35, "UI sidebar width (%)", gr.Slider, {"minimum": 10, "maximum": 80, "step": 1}), - "extra_networks_card_size": OptionInfo(160, "UI card size (px)", gr.Slider, {"minimum": 20, "maximum": 2000, "step": 1}), + "extra_networks_card_size": OptionInfo(140, "UI card size (px)", gr.Slider, {"minimum": 20, "maximum": 2000, "step": 1}), "extra_networks_card_square": OptionInfo(True, "UI disable variable aspect ratio"), "extra_networks_fetch": OptionInfo(True, "UI fetch network info on mouse-over"), "extra_network_skip_indexing": OptionInfo(False, "Build info on first access", gr.Checkbox), diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index e9c03c6c8..7787ea1fc 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -29,9 +29,9 @@ debug('Trace: EN') card_full = '''
-
{title}
+
{version}
🛈