diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b4918b28..056c368c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - major ui simplification for both txt2img and img2img nothing is removed, but you can show/hide invidividual sections default is very simple interface, but you can enable any sections and save it as default in settings + - themes: add additional built-in theme, `amethyst-nightfall` - extra networks: add add/remove tags to prompt (e.g. lora activation keywords) - extensions: fix couple of compatibility items - firefox compatibility improvements diff --git a/html/locale_en.json b/html/locale_en.json index a122685ce..31344ff93 100644 --- a/html/locale_en.json +++ b/html/locale_en.json @@ -9,7 +9,7 @@ {"id":"","label":"📒","localized":"","hint":"Fill"}, {"id":"","label":"🎲️","localized":"","hint":"Use random seed"}, {"id":"","label":"♻️","localized":"","hint":"Reuse previous seed"}, - {"id":"","label":"⇅","localized":"","hint":"Swap image height and width values"} + {"id":"","label":"⇅","localized":"","hint":"Swap values"} ], "prompts": [ {"id":"","label":"Prompt","localized":"","hint":"Type what you want to see in the image"}, diff --git a/modules/processing.py b/modules/processing.py index 7b54c29c9..afbe18e67 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -1054,7 +1054,6 @@ class StableDiffusionProcessingImg2Img(StableDiffusionProcessing): image = images.resize_image(self.resize_mode, image, self.width, self.height) self.width = image.width self.height = image.height - print('HERE2', self.width, self.height) image_masked = Image.new('RGBa', (image.width, image.height)) image_masked.paste(image.convert("RGBA").convert("RGBa"), mask=ImageOps.invert(self.mask_for_overlay.convert('L'))) self.mask = image_mask # assign early for diffusers diff --git a/modules/shared.py b/modules/shared.py index d84951cb2..9dd30b233 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -261,7 +261,7 @@ def list_themes(): res = [] list_builtin_themes() builtin = list_builtin_themes() + ["gradio/default", "gradio/base", "gradio/glass", "gradio/monochrome", "gradio/soft"] - themes = sorted(set(builtin + [x['id'] for x in res if x['status'] == 'RUNNING' and 'test' not in x['id'].lower()]), key=str.casefold) + themes = sorted(builtin) + sorted({x['id'] for x in res if x['status'] == 'RUNNING' and 'test' not in x['id'].lower()}, key=str.casefold) return themes diff --git a/modules/ui.py b/modules/ui.py index 5dbdc2fdd..b082b5066 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -1181,10 +1181,12 @@ def html_body(): def html_css(): added = [] + def stylesheet(fn): added.append(fn) return f'' - head = stylesheet('javascript/style.css') + + head = stylesheet(os.path.join(script_path, 'javascript/style.css')) for cssfile in modules.scripts.list_files_with_name("style.css"): if not os.path.isfile(cssfile): continue