diff --git a/README.md b/README.md index 54fd1bf04..5a2a3ebfe 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,10 @@ All individual features are not listed here, instead check [ChangeLog](CHANGELOG - Built in installer with automatic updates and dependency management - Modernized UI with theme support and number of built-in themes *(dark and light)* -
![screenshot](html/black-teal.jpg)
+
+![Screenshot-Dark](html/black-teal.jpg) +![Screenshot-Light](html/light-teal.jpg) +
## Backend support diff --git a/extensions-builtin/Lora/extra_networks_lora.py b/extensions-builtin/Lora/extra_networks_lora.py index 40ac8b909..82aa82454 100644 --- a/extensions-builtin/Lora/extra_networks_lora.py +++ b/extensions-builtin/Lora/extra_networks_lora.py @@ -64,7 +64,7 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork): self.active = False def deactivate(self, p): - if shared.backend == shared.Backend.DIFFUSERS: + if shared.backend == shared.Backend.DIFFUSERS and hasattr(shared.sd_model, "unload_lora_weights"): shared.sd_model.unload_lora_weights() if not self.active and getattr(networks, "originals", None ) is not None: networks.originals.undo() # remove patches diff --git a/html/light-teal.jpg b/html/light-teal.jpg index 2b6292c6e..f09546a02 100644 Binary files a/html/light-teal.jpg and b/html/light-teal.jpg differ diff --git a/modules/theme.py b/modules/theme.py index 1b29ef630..83a14c902 100644 --- a/modules/theme.py +++ b/modules/theme.py @@ -64,7 +64,7 @@ def reload_gradio_theme(theme_name=None): 'font_mono':['IBM Plex Mono', 'ui-monospace', 'Consolas', 'monospace'] } is_builtin = theme_name in list_builtin_themes() - modules.shared.log.info(f'Load UI theme: name="{theme_name}" style={modules.shared.opts.theme_style} base={"style.css" if is_builtin else "base.css"}') + modules.shared.log.info(f'Load UI theme: name="{theme_name}" style={modules.shared.opts.theme_style} base={"sdnext.css" if is_builtin else "base.css"}') if is_builtin: gradio_theme = gr.themes.Base(**default_font_params) elif theme_name.startswith("gradio/"): diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index 3a61f90f4..5fa0e1aa6 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -253,8 +253,10 @@ class ExtraNetworksPage: subdir = tgt[len(parentdir):].replace("\\", "/") while subdir.startswith("/"): subdir = subdir[1:] - if not self.is_empty(tgt): + # if not self.is_empty(tgt): + if not subdir.startswith("."): subdirs[subdir] = 1 + debug(f"Extra networks: page='{self.name}' subfolders={list(subdirs)}") subdirs = OrderedDict(sorted(subdirs.items())) if shared.backend == shared.Backend.DIFFUSERS and self.name == 'model': subdirs['Reference'] = 1 @@ -279,7 +281,7 @@ class ExtraNetworksPage: self.html = f"
{subdirs_html}
{self.html}
" else: return '' - shared.log.debug(f"Extra networks: page='{self.name}' items={len(self.items)} subdirs={len(subdirs)} tab={tabname} dirs={self.allowed_directories_for_previews()} list={self.list_time:.2f} desc={self.desc_time:.2f} info={self.info_time:.2f}") + shared.log.debug(f"Extra networks: page='{self.name}' items={len(self.items)} subfolders={len(subdirs)} tab={tabname} folders={self.allowed_directories_for_previews()} list={self.list_time:.2f} desc={self.desc_time:.2f} info={self.info_time:.2f}") if len(self.missing_thumbs) > 0: threading.Thread(target=self.create_thumb).start() return self.html