diff --git a/CHANGELOG.md b/CHANGELOG.md index 3db10930c..8dc503635 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log for SD.Next -## Update for 2024-02-12 +## Update for 2024-02-13 - **improvements**: - **IP Adapter** major refactor @@ -47,6 +47,8 @@ - **wiki**: - updated benchmark notes for IPEX and Olive - **fixes**: + - handle extensions that install conflicting versions of packages + `onnxruntime`, `opencv2-python` - installer refresh package cache on any install - ipex handle dependencies, thanks @Disty0 - insightface handle dependencies @@ -60,8 +62,7 @@ - fix vae dtype mismatch, thanks @Disty0 - fix controlnet inpaint mask - bind controlnet extension to last known working commit, thanks @Aptronymist - - handle extensions that install conflicting versions of packages - `onnxruntime`, `opencv2-python` + - prompts-from-file fix resizable prompt area ## Update for 2024-02-07 diff --git a/javascript/sdnext.css b/javascript/sdnext.css index 56f8c8f5b..dd8ff6d35 100644 --- a/javascript/sdnext.css +++ b/javascript/sdnext.css @@ -317,7 +317,7 @@ table.settings-value-table td { padding: 0.4em; border: 1px solid #ccc; max-widt #txt2img_results, #extras_results, #txt2im g_footer p {text-wrap: wrap; max-width: 100% !important; } /* maintain side by side split on larger mobile displays for from text */ } #scripts_alwayson_txt2img div, #scripts_alwayson_img2img div { max-width: 100%; } - #txt2img_prompt_container, #img2img_prompt_container, #control_prompt_container { resize:vertical !important; } + #txt2img_prompt_container, #img2img_prompt_container, #control_prompt_container { resize: vertical !important; } #txt2img_generate_box, #txt2img_enqueue_wrapper { min-width: 100% !important;} /* make generate and enqueue buttons take up the entire width of their rows. */ #img2img_toprow>div.gradio-column {flex-grow: 1 !important;} /*make interrogate buttons take up appropriate space. */ #img2img_actions_column {display: flex; min-width: fit-content !important; flex-direction: row;justify-content: space-evenly; align-items: center;} @@ -340,5 +340,6 @@ table.settings-value-table td { padding: 0.4em; border: 1px solid #ccc; max-widt .gradio-dropdown ul.options li.item {height: 40px !important; display: flex; align-items: center;} .gradio-slider input[type="number"] { width: 4em; font-size: var(--text-xs); height: 16px; text-align: center; } /* adjust slider input fields as they were too large for mobile devices. */ #txt2img_settings .block .padded:not(.gradio-accordion) {padding: 0 !important;margin-right: 0; min-width: 100% !important; width:100% !important;} + #script_txt2img_prompts_from_file_prompt_txt, #script_img2img_prompts_from_file_prompt_txt, #script_control2img_prompts_from_file_prompt_txt { resize: vertical !important; } } } diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py index aa888e096..80b85cd26 100644 --- a/scripts/prompts_from_file.py +++ b/scripts/prompts_from_file.py @@ -98,10 +98,9 @@ class Script(scripts.Script): with gr.Row(): checkbox_iterate = gr.Checkbox(label="Iterate seed per line", value=False, elem_id=self.elem_id("checkbox_iterate")) checkbox_iterate_batch = gr.Checkbox(label="Use same seed", value=False, elem_id=self.elem_id("checkbox_iterate_batch")) - prompt_txt = gr.Textbox(label="Prompts", lines=1, elem_id=self.elem_id("prompt_txt")) + prompt_txt = gr.Textbox(label="Prompts", lines=2, elem_id=self.elem_id("prompt_txt")) file = gr.File(label="Upload prompts", type='binary', elem_id=self.elem_id("file")) file.change(fn=load_prompt_file, inputs=[file], outputs=[file, prompt_txt, prompt_txt], show_progress=False) - prompt_txt.change(lambda tb: gr.update(lines=7) if ("\n" in tb) else gr.update(lines=2), inputs=[prompt_txt], outputs=[prompt_txt], show_progress=False) return [checkbox_iterate, checkbox_iterate_batch, prompt_txt]