diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index 94ebcce25..bd60be82e 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit 94ebcce25b43fd8bd2716902b91090dc65afd44e +Subproject commit bd60be82e47d1e993c8601edb5cfca57e8a82518 diff --git a/html/amethyst-nightfall.jpg b/html/amethyst-nightfall.jpg deleted file mode 100644 index 216f2f765..000000000 Binary files a/html/amethyst-nightfall.jpg and /dev/null differ diff --git a/html/black-orange.jpg b/html/black-orange.jpg deleted file mode 100644 index 90c4bca0a..000000000 Binary files a/html/black-orange.jpg and /dev/null differ diff --git a/html/black-teal.jpg b/html/black-teal.jpg deleted file mode 100644 index 06f604f86..000000000 Binary files a/html/black-teal.jpg and /dev/null differ diff --git a/html/emerald-paradise.jpg b/html/emerald-paradise.jpg deleted file mode 100644 index 73a4b7a5f..000000000 Binary files a/html/emerald-paradise.jpg and /dev/null differ diff --git a/html/gradio-base.jpg b/html/gradio-base.jpg deleted file mode 100644 index 97a29c107..000000000 Binary files a/html/gradio-base.jpg and /dev/null differ diff --git a/html/gradio-default.jpg b/html/gradio-default.jpg deleted file mode 100644 index bb9097be4..000000000 Binary files a/html/gradio-default.jpg and /dev/null differ diff --git a/html/gradio-glass.jpg b/html/gradio-glass.jpg deleted file mode 100644 index 984a509bf..000000000 Binary files a/html/gradio-glass.jpg and /dev/null differ diff --git a/html/gradio-monochrome.jpg b/html/gradio-monochrome.jpg deleted file mode 100644 index ab2134fb4..000000000 Binary files a/html/gradio-monochrome.jpg and /dev/null differ diff --git a/html/gradio-soft.jpg b/html/gradio-soft.jpg deleted file mode 100644 index 1ba487a7c..000000000 Binary files a/html/gradio-soft.jpg and /dev/null differ diff --git a/html/image-update.svg b/html/image-update.svg deleted file mode 100644 index 3abf12df0..000000000 --- a/html/image-update.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/html/invoked.jpg b/html/invoked.jpg deleted file mode 100644 index fd0c1a965..000000000 Binary files a/html/invoked.jpg and /dev/null differ diff --git a/html/light-teal.jpg b/html/light-teal.jpg deleted file mode 100644 index f09546a02..000000000 Binary files a/html/light-teal.jpg and /dev/null differ diff --git a/html/midnight-barbie.jpg b/html/midnight-barbie.jpg deleted file mode 100644 index c4182e8f1..000000000 Binary files a/html/midnight-barbie.jpg and /dev/null differ diff --git a/html/card-no-preview.png b/html/missing.png similarity index 100% rename from html/card-no-preview.png rename to html/missing.png diff --git a/html/orchid-dreams.jpg b/html/orchid-dreams.jpg deleted file mode 100644 index 8a62eeb0a..000000000 Binary files a/html/orchid-dreams.jpg and /dev/null differ diff --git a/html/simple-dark.jpg b/html/simple-dark.jpg deleted file mode 100644 index 0aa0f2450..000000000 Binary files a/html/simple-dark.jpg and /dev/null differ diff --git a/html/simple-light.jpg b/html/simple-light.jpg deleted file mode 100644 index aa85547c3..000000000 Binary files a/html/simple-light.jpg and /dev/null differ diff --git a/html/timeless-beige.jpg b/html/timeless-beige.jpg deleted file mode 100644 index e8c591379..000000000 Binary files a/html/timeless-beige.jpg and /dev/null differ diff --git a/javascript/black-teal-reimagined.css b/javascript/black-teal-reimagined.css index cd2d7d524..dc3d4d0ce 100644 --- a/javascript/black-teal-reimagined.css +++ b/javascript/black-teal-reimagined.css @@ -953,7 +953,7 @@ svg.feather.feather-image, } /* No Preview Card Styles */ -.extra-network-cards .card:has(>img[src*="card-no-preview.png"])::before { +.extra-network-cards .card:has(>img[src*="missing.png"])::before { content: ''; position: absolute; width: 100%; diff --git a/javascript/civitai.js b/javascript/civitai.js index 31f1fc890..71e957380 100644 --- a/javascript/civitai.js +++ b/javascript/civitai.js @@ -107,7 +107,7 @@ async function modelCardClick(id) { downloads: data.downloads?.toString() || '', creator, desc: data.desc || 'no description available', - image: images.length > 0 ? images[0] : '/sdapi/v1/network/thumb?filename=html/card-no-preview.png', + image: images.length > 0 ? images[0] : '/sdapi/v1/network/thumb?filename=html/missing.png', versions: versionsHTML || '', }); el.innerHTML = modelHTML; diff --git a/javascript/sdnext.css b/javascript/sdnext.css index 7c4b6628d..5c29863ab 100644 --- a/javascript/sdnext.css +++ b/javascript/sdnext.css @@ -1386,7 +1386,7 @@ table.settings-value-table td { z-index: 101; /* Optional: ensure tags are above everything */ } -.extra-network-cards .card:has(>img[src*="card-no-preview.png"])::before { +.extra-network-cards .card:has(>img[src*="missing.png"])::before { background-color: var(--data-color); content: ''; height: 100%; diff --git a/modules/civitai/metadata_civitai.py b/modules/civitai/metadata_civitai.py index 20b48a251..6d4315860 100644 --- a/modules/civitai/metadata_civitai.py +++ b/modules/civitai/metadata_civitai.py @@ -168,7 +168,7 @@ def atomic_civit_search_metadata(item, results): # log.error(f'CivitAI search metadata: item={item} {e}') return has_meta = os.path.isfile(meta) and os.stat(meta).st_size > 0 - if ('card-no-preview.png' in item['preview'] or not has_meta) and os.path.isfile(item['filename']): + if ('missing.png' in item['preview'] or not has_meta) and os.path.isfile(item['filename']): sha = item.get('hash', None) found = False result = { diff --git a/modules/civitai/search_civitai.py b/modules/civitai/search_civitai.py index 226925bf9..0465411b9 100644 --- a/modules/civitai/search_civitai.py +++ b/modules/civitai/search_civitai.py @@ -200,7 +200,7 @@ def create_model_cards(all_models: list[Model]) -> str: if image.url and len(image.url) > 0 and not image.url.lower().endswith('.mp4'): previews.append(image.url) if len(previews) == 0: - previews = ['/sdapi/v1/network/thumb?filename=html/card-no-preview.png'] + previews = ['/sdapi/v1/network/thumb?filename=html/missing.png'] all_cards += card.format(id=model.id, name=model.name, type=model.type, preview=previews[0]) html = details + cards.format(cards=all_cards) return html diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index b30277e6d..7bc0f22d6 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -349,7 +349,7 @@ class ExtraNetworksPage: "filename": item.get('filename', ''), "short": os.path.splitext(os.path.basename(item.get('filename', '')))[0], "tags": '|'.join([item.get('tags')] if isinstance(item.get('tags', {}), str) else list(item.get('tags', {}).keys())), - "preview": html.escape(item.get('preview', None) or self.link_preview('html/card-no-preview.png')), + "preview": html.escape(item.get('preview', None) or self.link_preview('html/missing.png')), "width": 'var(--card-size)', "height": 'var(--card-size)' if shared.opts.extra_networks_card_square else 'auto', "fit": shared.opts.extra_networks_card_fit, @@ -375,7 +375,7 @@ class ExtraNetworksPage: def find_preview_file(self, path): if path is None: - return 'html/card-no-preview.png' + return 'html/missing.png' if os.path.join('models', 'Reference') in path: return path exts = ["jpg", "jpeg", "png", "webp", "tiff", "jp2", "jxl"] @@ -392,7 +392,7 @@ class ExtraNetworksPage: if '.thumb.' not in file: self.missing_thumbs.append(file) return file - return 'html/card-no-preview.png' + return 'html/missing.png' def find_preview(self, filename): t0 = time.time() @@ -442,7 +442,7 @@ class ExtraNetworksPage: item['preview'] = self.link_preview(found) debug(f'EN mapped-preview: {item["name"]}={found}') if item.get('preview', None) is None: - item['preview'] = self.link_preview('html/card-no-preview.png') + item['preview'] = self.link_preview('html/missing.png') debug(f'EN missing-preview: {item["name"]}') self.preview_time += time.time() - t0 @@ -710,19 +710,19 @@ def create_ui(container, button_parent, tabname, skip_indexing = False): def fn_save_img(image): if ui.last_item is None or ui.last_item.local_preview is None: - return 'html/card-no-preview.png' + return 'html/missing.png' images = [] if ui.gallery is not None: images = list(ui.gallery.temp_files) # gallery cannot be used as input component so looking at most recently registered temp files if len(images) < 1: shared.log.warning(f'Network no image: item="{ui.last_item.name}"') - return 'html/card-no-preview.png' + return 'html/missing.png' try: images.sort(key=lambda f: os.path.getmtime(f), reverse=True) image = Image.open(images[0]) except Exception as e: shared.log.error(f'Network error opening image: item="{ui.last_item.name}" {e}') - return 'html/card-no-preview.png' + return 'html/missing.png' fn_delete_img(image) if image.width > 512 or image.height > 512: image = image.convert('RGB') @@ -741,7 +741,7 @@ def create_ui(container, button_parent, tabname, skip_indexing = False): if os.path.exists(file): os.remove(file) shared.log.debug(f'Network delete image: item="{ui.last_item.name}" filename="{file}"') - return 'html/card-no-preview.png' + return 'html/missing.png' def fn_save_desc(desc): if hasattr(ui.last_item, 'type') and ui.last_item.type == 'Style':