From e9952c9c95f53dbed85ab42d4478603266bfa8eb Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sat, 4 Feb 2023 17:01:24 -0500 Subject: [PATCH] major update --- automatic.sh | 24 +- config.json | 306 +++++++++--------- .../stable-diffusion-webui-images-browser | 2 +- modules/ui.py | 27 +- requirements_versions.txt | 2 +- scripts/postprocessing_upscale.py | 4 +- ui-config.json | 6 +- user.css | 26 +- 8 files changed, 202 insertions(+), 195 deletions(-) diff --git a/automatic.sh b/automatic.sh index 5370a20af..7cc8fe150 100755 --- a/automatic.sh +++ b/automatic.sh @@ -34,9 +34,6 @@ for i in "$@"; do clean) MODE=clean ;; - env) - MODE=env - ;; *) CMD="$CMD $i" ;; @@ -46,6 +43,13 @@ done echo "SD server: $MODE" +VER=`git log -1 --pretty=format:"%h %ad"` +LSB=`lsb_release -ds 2>/dev/null` +UN=`uname -rm 2>/dev/null` +echo "Version: $VER" +echo "Platform: $LSB $UN" +$PYTHON -c 'import torch; import platform; print("Python:", platform.python_version(), "Torch:", torch.__version__, "CUDA:", torch.version.cuda, "cuDNN:", torch.backends.cudnn.version(), "GPU:", torch.cuda.get_device_name(torch.cuda.current_device()), "Arch:", torch.cuda.get_device_capability());' + if [ $MODE == install ]; then $PYTHON --version $PYTHON -m pip --version @@ -53,16 +57,8 @@ if [ $MODE == install ]; then $PYTHON -m pip install --disable-pip-version-check --quiet --no-warn-conflicts --requirement requirements.txt echo "Installing versioned requirements" $PYTHON -m pip install --disable-pip-version-check --quiet --no-warn-conflicts --requirement requirements_versions.txt - exit 0 -fi - -if [ $MODE == env ]; then - VER=`git log -1 --pretty=format:"%h %ad"` - LSB=`lsb_release -ds 2>/dev/null` - UN=`uname -rm 2>/dev/null` - echo "Version: $VER" - echo "Platform: $LSB $UN" - $PYTHON -c 'import torch; import platform; print("Python:", platform.python_version(), "Torch:", torch.__version__, "CUDA:", torch.version.cuda, "cuDNN:", torch.backends.cudnn.version(), "GPU:", torch.cuda.get_device_name(torch.cuda.current_device()), "Arch:", torch.cuda.get_device_capability());' + echo "Updating submodules" + git submodule update --rebase --remote exit 0 fi @@ -80,4 +76,4 @@ if [ $MODE == optimized ]; then CMD="$CMD" fi -exec accelerate launch --no_python --num_cpu_threads_per_process=6 $PYTHON $CMD +exec accelerate launch --no_python --quiet --num_cpu_threads_per_process=6 $PYTHON $CMD diff --git a/config.json b/config.json index cc078f23f..c4105c4a9 100644 --- a/config.json +++ b/config.json @@ -1,119 +1,173 @@ { - "samples_save": true, - "samples_format": "jpg", - "samples_filename_pattern": "", - "save_images_add_number": true, - "grid_save": true, - "grid_format": "jpg", - "grid_extended_filename": true, - "grid_only_if_multiple": true, - "grid_prevent_empty_spots": true, - "n_rows": -1, - "enable_pnginfo": true, - "save_txt": false, - "save_images_before_face_restoration": false, - "save_images_before_highres_fix": false, - "save_images_before_color_correction": false, - "jpeg_quality": 80, - "export_for_4chan": true, - "use_original_name_batch": true, - "use_upscaler_name_as_suffix": true, - "save_selected_only": true, - "do_not_add_watermark": true, - "temp_dir": "", + "add_model_hash_to_info": true, + "add_model_name_to_info": true, + "aesthetic_scorer_clip_model": "ViT-L/14", + "aesthetic_scorer_enabled": false, + "always_discard_next_to_last_sigma": false, "clean_temp_dir_at_start": true, - "outdir_samples": "", - "outdir_txt2img_samples": "outputs/text", - "outdir_img2img_samples": "outputs/image", - "outdir_extras_samples": "outputs/extras", - "outdir_grids": "", - "outdir_txt2img_grids": "outputs/grids", - "outdir_img2img_grids": "outputs/grids", - "outdir_save": "outputs/save", - "save_to_dirs": false, - "grid_save_to_dirs": false, - "use_save_to_dirs_for_ui": false, + "CLIP_stop_at_last_layers": 1, + "code_former_weight": 0.15, + "comma_padding_backtrack": 20, + "dataset_filename_join_string": " ", + "dataset_filename_word_regex": "", + "ddim_discretize": "uniform", + "deepbooru_escape": true, + "deepbooru_filter_tags": "", + "deepbooru_sort_alpha": false, + "deepbooru_use_spaces": false, + "dimensions_and_batch_together": true, "directories_filename_pattern": "", "directories_max_prompt_words": 8, - "ESRGAN_tile": 192, + "disable_weights_auto_swap": false, + "disabled_extensions": [ + "prompt-fusion-extension", + "sd-webui-additional-networks", + "sdweb-merge-board", + "ScuNET" + ], + "do_not_add_watermark": true, + "do_not_show_images": false, + "enable_batch_seeds": true, + "enable_emphasis": true, + "enable_pnginfo": true, + "enable_quantization": true, "ESRGAN_tile_overlap": 8, + "ESRGAN_tile": 192, + "eta_ancestral": 1.0, + "eta_ddim": 0.0, + "eta_noise_seed_delta": 0, + "export_for_4chan": true, + "extra_networks_default_multiplier": 1, + "extra_networks_default_view": "cards", + "face_restoration_model": "CodeFormer", + "face_restoration_unload": false, + "font": "", + "grid_extended_filename": true, + "grid_format": "jpg", + "grid_only_if_multiple": true, + "grid_prevent_empty_spots": true, + "grid_save_to_dirs": false, + "grid_save": true, + "images_copy_image": false, + "images_delete_message": false, + "images_delete_recycle": false, + "images_history_page_columns": 6.0, + "images_history_page_rows": 20.0, + "images_history_pages_perload": 20.0, + "images_history_preload": false, + "images_history_with_subdirs": false, + "images_record_paths": true, + "img2img_background_color": "#ffffff", + "img2img_color_correction": false, + "img2img_fix_steps": false, + "initial_noise_multiplier": 1.0, + "inpainting_mask_weight": 1.0, + "inspiration_cols_num": 6, + "inspiration_max_samples": 4, + "inspiration_rows_num": 4, + "interrogate_clip_dict_limit": 2048.0, + "interrogate_clip_max_length": 128, + "interrogate_clip_min_length": 32, + "interrogate_clip_num_beams": 1, + "interrogate_clip_skip_categories": [ + "artists", + "movements", + "flavors" + ], + "interrogate_deepbooru_score_threshold": 0.65, + "interrogate_keep_models_in_memory": false, + "interrogate_return_ranks": true, + "interrogate_use_builtin_artists": false, + "jpeg_quality": 80, + "js_modal_lightbox_initially_zoomed": true, + "js_modal_lightbox": true, + "keyedit_precision_attention": 0.1, + "keyedit_precision_extra": 0.05, + "ldsr_cached": false, + "ldsr_steps": 100, + "live_preview_content": "Prompt", + "live_preview_refresh_period": 1000, + "live_previews_enable": true, + "localization": "None", + "lora_apply_to_outputs": false, + "memmon_poll_rate": 8, + "multiple_tqdm": false, + "n_rows": -1, + "outdir_extras_samples": "outputs/extras", + "outdir_grids": "", + "outdir_img2img_grids": "outputs/grids", + "outdir_img2img_samples": "outputs/image", + "outdir_ip2p_samples": "outputs/ip2p-images", + "outdir_samples": "", + "outdir_save": "outputs/save", + "outdir_txt2img_grids": "outputs/grids", + "outdir_txt2img_samples": "outputs/text", + "pin_memory": true, + "postprocessing_enable_in_main_ui": [], + "postprocessing_operation_order": [], + "postprocessing_scipts_order": "upscale, gfpgan, codeformer", + "print_hypernet_extra": false, + "quicksettings": "sd_model_checkpoint", + "random_artist_categories": [], "realesrgan_enabled_models": [ "R-ESRGAN 4x+" ], - "upscaler_for_img2img": null, - "face_restoration_model": "CodeFormer", - "code_former_weight": 0.15, - "face_restoration_unload": false, - "memmon_poll_rate": 8, + "return_grid": true, + "s_churn": 0.0, + "s_noise": 1.0, + "s_tmin": 0.0, + "samplers_in_dropdown": true, + "samples_filename_pattern": "", + "samples_format": "jpg", "samples_log_stdout": false, - "multiple_tqdm": false, - "print_hypernet_extra": false, - "unload_models_when_training": false, - "pin_memory": true, + "samples_save": true, + "save_images_add_number": true, + "save_images_before_color_correction": false, + "save_images_before_face_restoration": false, + "save_images_before_highres_fix": false, "save_optimizer_state": false, + "save_selected_only": true, + "save_to_dirs": false, "save_training_settings_to_txt": true, - "dataset_filename_word_regex": "", - "dataset_filename_join_string": " ", - "training_image_repeats_per_epoch": 1, - "training_write_csv_every": 1.0, - "training_xattention_optimizations": false, - "training_enable_tensorboard": false, - "training_tensorboard_save_images": false, - "training_tensorboard_flush_every": 120, - "sd_model_checkpoint": "sd-v15-runwayml.ckpt [cc6cb27103]", + "save_txt": false, "sd_checkpoint_cache": 0, + "sd_checkpoint_hash": "cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516", + "sd_hypernetwork_strength": 1.0, + "sd_hypernetwork": "None", + "sd_lora": "None", + "sd_model_checkpoint": "sd-v15-runwayml.ckpt [cc6cb27103]", + "sd_vae_as_default": false, "sd_vae_checkpoint_cache": 0, "sd_vae": "vae-ft-mse-840000-ema-pruned.ckpt", - "sd_vae_as_default": false, - "sd_hypernetwork": "None", - "sd_hypernetwork_strength": 1.0, - "inpainting_mask_weight": 1.0, - "initial_noise_multiplier": 1.0, - "img2img_color_correction": false, - "img2img_fix_steps": false, - "img2img_background_color": "#ffffff", - "enable_quantization": true, - "enable_emphasis": true, - "enable_batch_seeds": true, - "comma_padding_backtrack": 20, - "CLIP_stop_at_last_layers": 1, - "random_artist_categories": [], - "use_old_emphasis_implementation": false, - "use_old_karras_scheduler_sigmas": false, - "use_old_hires_fix_width_height": false, - "interrogate_keep_models_in_memory": false, - "interrogate_use_builtin_artists": false, - "interrogate_return_ranks": true, - "interrogate_clip_num_beams": 1, - "interrogate_clip_min_length": 32, - "interrogate_clip_max_length": 128, - "interrogate_clip_dict_limit": 2048.0, - "interrogate_deepbooru_score_threshold": 0.65, - "deepbooru_sort_alpha": false, - "deepbooru_use_spaces": false, - "deepbooru_escape": true, - "deepbooru_filter_tags": "", - "return_grid": true, - "do_not_show_images": false, - "add_model_hash_to_info": true, - "add_model_name_to_info": true, - "disable_weights_auto_swap": false, "send_seed": true, "send_size": true, - "font": "", - "js_modal_lightbox": true, - "js_modal_lightbox_initially_zoomed": true, - "show_progress_in_title": true, - "samplers_in_dropdown": true, - "dimensions_and_batch_together": true, - "quicksettings": "sd_model_checkpoint", - "ui_reorder": "sampler, dimensions, cfg, seed, checkboxes, hires_fix, batch, scripts", - "localization": "None", - "live_previews_enable": true, - "show_progress_grid": true, "show_progress_every_n_steps": -1, + "show_progress_grid": true, + "show_progress_in_title": true, "show_progress_type": "Full", - "live_preview_content": "Prompt", + "show_progressbar": true, + "show_warnings": false, + "SWIN_tile_overlap": 8, + "SWIN_tile": 192, + "temp_dir": "", + "training_enable_tensorboard": false, + "training_image_repeats_per_epoch": 1, + "training_tensorboard_flush_every": 120, + "training_tensorboard_save_images": false, + "training_write_csv_every": 1.0, + "training_xattention_optimizations": false, + "ui_extra_networks_tab_reorder": "", + "ui_reorder": "sampler, dimensions, cfg, seed, checkboxes, hires_fix, batch, scripts", + "unload_models_when_training": false, + "upcast_attn": false, + "upscaler_for_img2img": null, + "upscaling_max_images_in_cache": 5, + "use_old_emphasis_implementation": false, + "use_old_hires_fix_width_height": false, + "use_old_karras_scheduler_sigmas": false, + "use_original_name_batch": true, + "use_save_to_dirs_for_ui": false, + "use_upscaler_name_as_suffix": true, "hide_samplers": [ "Euler", "LMS", @@ -130,59 +184,5 @@ "DPM++ SDE Karras", "DPM2 a Karras", "LMS Karras" - ], - "eta_ddim": 0.0, - "eta_ancestral": 1.0, - "ddim_discretize": "uniform", - "s_churn": 0.0, - "s_tmin": 0.0, - "s_noise": 1.0, - "eta_noise_seed_delta": 0, - "always_discard_next_to_last_sigma": false, - "disabled_extensions": [ - "prompt-fusion-extension", - "sd-webui-additional-networks", - "sdweb-merge-board", - "ScuNET" - ], - "sd_checkpoint_hash": "cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516", - "ldsr_steps": 100, - "ldsr_cached": false, - "SWIN_tile": 192, - "SWIN_tile_overlap": 8, - "aesthetic_scorer_enabled": false, - "aesthetic_scorer_clip_model": "ViT-L/14", - "images_history_preload": false, - "images_record_paths": true, - "images_delete_message": true, - "images_history_page_columns": 6.0, - "images_history_page_rows": 20.0, - "images_history_pages_perload": 20.0, - "inspiration_max_samples": 4, - "inspiration_rows_num": 4, - "inspiration_cols_num": 6, - "live_preview_refresh_period": 1000, - "show_progressbar": true, - "show_warnings": false, - "extra_networks_default_multiplier": 1, - "keyedit_precision_attention": 0.1, - "keyedit_precision_extra": 0.05, - "ui_extra_networks_tab_reorder": "", - "interrogate_clip_skip_categories": [ - "artists", - "movements", - "flavors" - ], - "extra_networks_default_view": "cards", - "postprocessing_scipts_order": "upscale, gfpgan, codeformer", - "upscaling_max_images_in_cache": 5, - "upcast_attn": false, - "lora_apply_to_outputs": false, - "outdir_ip2p_samples": "outputs/ip2p-images", - "postprocessing_enable_in_main_ui": [], - "postprocessing_operation_order": [], - "sd_lora": "None", - "images_history_with_subdirs": false, - "images_copy_image": false, - "images_delete_recycle": false + ] } \ No newline at end of file diff --git a/extensions-builtin/stable-diffusion-webui-images-browser b/extensions-builtin/stable-diffusion-webui-images-browser index 16dfbfcf7..be513d619 160000 --- a/extensions-builtin/stable-diffusion-webui-images-browser +++ b/extensions-builtin/stable-diffusion-webui-images-browser @@ -1 +1 @@ -Subproject commit 16dfbfcf7c2f1ec4006beafc4f1cb61bc7357326 +Subproject commit be513d619b7634d5870e762700bfd405999b3c7a diff --git a/modules/ui.py b/modules/ui.py index 11c8e41f0..cbe6b9310 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -186,12 +186,12 @@ def create_seed_inputs(target_interface): reuse_seed = gr.Button(reuse_symbol, elem_id=target_interface + '_reuse_seed') with gr.Group(elem_id=target_interface + '_subseed_show_box'): - seed_checkbox = gr.Checkbox(label='Extra', elem_id=target_interface + '_subseed_show', value=False) + seed_checkbox = gr.Checkbox(label='Extra', elem_id=target_interface + '_subseed_show', value=True) # Components to show/hide based on the 'Extra' checkbox seed_extras = [] - with FormRow(visible=False, elem_id=target_interface + '_subseed_row') as seed_extra_row_1: + with FormRow(visible=True, elem_id=target_interface + '_subseed_row') as seed_extra_row_1: seed_extras.append(seed_extra_row_1) subseed = gr.Number(label='Variation seed', value=-1, elem_id=target_interface + '_subseed') subseed.style(container=False) @@ -483,22 +483,25 @@ def create_ui(): res_switch_btn = ToolButton(value=switch_values_symbol, elem_id="txt2img_res_switch_btn") if opts.dimensions_and_batch_together: with gr.Column(elem_id="txt2img_column_batch"): - batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="txt2img_batch_count") - batch_size = gr.Slider(minimum=1, maximum=8, step=1, label='Batch size', value=1, elem_id="txt2img_batch_size") + with FormRow(elem_id="txt2img_row_batch"): + batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="txt2img_batch_count") + batch_size = gr.Slider(minimum=1, maximum=8, step=1, label='Batch size', value=1, elem_id="txt2img_batch_size") - elif category == "cfg": - cfg_scale = gr.Slider(minimum=1.0, maximum=30.0, step=0.5, label='CFG Scale', value=7.0, elem_id="txt2img_cfg_scale") elif category == "seed": seed, reuse_seed, subseed, reuse_subseed, subseed_strength, seed_resize_from_h, seed_resize_from_w, seed_checkbox = create_seed_inputs('txt2img') elif category == "checkboxes": with FormRow(elem_id="txt2img_checkboxes", variant="compact"): + cfg_scale = gr.Slider(minimum=1.0, maximum=30.0, step=0.5, label='CFG Scale', value=7.0, elem_id="txt2img_cfg_scale") restore_faces = gr.Checkbox(label='Restore faces', value=False, visible=len(shared.face_restorers) > 1, elem_id="txt2img_restore_faces") tiling = gr.Checkbox(label='Tiling', value=False, elem_id="txt2img_tiling") - enable_hr = gr.Checkbox(label='Hires. fix', value=False, elem_id="txt2img_enable_hr") + enable_hr = gr.Checkbox(label='Hi-res tiling', value=False, elem_id="txt2img_enable_hr") hr_final_resolution = FormHTML(value="", elem_id="txtimg_hr_finalres", label="Upscaled resolution", interactive=False) + # elif category == "cfg": + # cfg_scale = gr.Slider(minimum=1.0, maximum=30.0, step=0.5, label='CFG Scale', value=7.0, elem_id="txt2img_cfg_scale") + elif category == "hires_fix": with FormGroup(visible=False, elem_id="txt2img_hires_fix") as hr_options: with FormRow(elem_id="txt2img_hires_fix_row1", variant="compact"): @@ -755,14 +758,16 @@ def create_ui(): elif category == "dimensions": with FormRow(): with gr.Column(elem_id="img2img_column_size", scale=4): - width = gr.Slider(minimum=64, maximum=2048, step=8, label="Width", value=512, elem_id="img2img_width") - height = gr.Slider(minimum=64, maximum=2048, step=8, label="Height", value=512, elem_id="img2img_height") + with FormRow(elem_id="img2img_row_size"): + width = gr.Slider(minimum=64, maximum=2048, step=8, label="Width", value=512, elem_id="img2img_width") + height = gr.Slider(minimum=64, maximum=2048, step=8, label="Height", value=512, elem_id="img2img_height") res_switch_btn = ToolButton(value=switch_values_symbol, elem_id="img2img_res_switch_btn") if opts.dimensions_and_batch_together: with gr.Column(elem_id="img2img_column_batch"): - batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="img2img_batch_count") - batch_size = gr.Slider(minimum=1, maximum=8, step=1, label='Batch size', value=1, elem_id="img2img_batch_size") + with FormRow(elem_id="img2img_row_batch"): + batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="img2img_batch_count") + batch_size = gr.Slider(minimum=1, maximum=8, step=1, label='Batch size', value=1, elem_id="img2img_batch_size") elif category == "cfg": with FormGroup(): diff --git a/requirements_versions.txt b/requirements_versions.txt index 8603c4d04..5931d2ccc 100644 --- a/requirements_versions.txt +++ b/requirements_versions.txt @@ -1,4 +1,4 @@ -accelerate==0.15.0 +accelerate==0.16.0 basicsr==1.4.2 blendmodes==2022 clean-fid==0.1.35 diff --git a/scripts/postprocessing_upscale.py b/scripts/postprocessing_upscale.py index 8842bd91c..069dfd1ac 100644 --- a/scripts/postprocessing_upscale.py +++ b/scripts/postprocessing_upscale.py @@ -20,6 +20,7 @@ class ScriptPostprocessingUpscale(scripts_postprocessing.ScriptPostprocessing): with gr.Tabs(elem_id="extras_resize_mode"): with gr.TabItem('Scale by', elem_id="extras_scale_by_tab") as tab_scale_by: upscaling_resize = gr.Slider(minimum=1.0, maximum=8.0, step=0.05, label="Resize", value=4, elem_id="extras_upscaling_resize") + extras_upscaler_1 = gr.Dropdown(label='Upscaler 1', elem_id="extras_upscaler_1", choices=[x.name for x in shared.sd_upscalers], value=shared.sd_upscalers[0].name) with gr.TabItem('Scale to', elem_id="extras_scale_to_tab") as tab_scale_to: with FormRow(): @@ -27,9 +28,6 @@ class ScriptPostprocessingUpscale(scripts_postprocessing.ScriptPostprocessing): upscaling_resize_h = gr.Number(label="Height", value=512, precision=0, elem_id="extras_upscaling_resize_h") upscaling_crop = gr.Checkbox(label='Crop to fit', value=True, elem_id="extras_upscaling_crop") - with FormRow(): - extras_upscaler_1 = gr.Dropdown(label='Upscaler 1', elem_id="extras_upscaler_1", choices=[x.name for x in shared.sd_upscalers], value=shared.sd_upscalers[0].name) - with FormRow(): extras_upscaler_2 = gr.Dropdown(label='Upscaler 2', elem_id="extras_upscaler_2", choices=[x.name for x in shared.sd_upscalers], value=shared.sd_upscalers[0].name) extras_upscaler_2_visibility = gr.Slider(minimum=0.0, maximum=1.0, step=0.001, label="Upscaler 2 visibility", value=0.0, elem_id="extras_upscaler_2_visibility") diff --git a/ui-config.json b/ui-config.json index 8cbe3d954..3e5a61bc2 100644 --- a/ui-config.json +++ b/ui-config.json @@ -949,5 +949,9 @@ "customscript/postprocessing_codeformer.py/extras/CodeFormer weight (0 = max), 1 = min)/value": 0, "customscript/postprocessing_codeformer.py/extras/CodeFormer weight (0 = max), 1 = min)/minimum": 0.0, "customscript/postprocessing_codeformer.py/extras/CodeFormer weight (0 = max), 1 = min)/maximum": 1.0, - "customscript/postprocessing_codeformer.py/extras/CodeFormer weight (0 = max), 1 = min)/step": 0.001 + "customscript/postprocessing_codeformer.py/extras/CodeFormer weight (0 = max), 1 = min)/step": 0.001, + "txt2img/Hi-res Tiling/visible": true, + "txt2img/Hi-res Tiling/value": false, + "txt2img/Hi-res tiling/visible": true, + "txt2img/Hi-res tiling/value": false } \ No newline at end of file diff --git a/user.css b/user.css index 7e2767702..c890e1743 100644 --- a/user.css +++ b/user.css @@ -3,7 +3,7 @@ html { font-size: 16px; } body, button, input, select, textarea { font-family: "Segoe UI"; font-variant: small-caps; } button { font-size: 1.2rem; } img { background-color: black; } -input[type=range] { height: 14px; appearance: none; margin-top: 12px } +input[type=range] { height: 14px; appearance: none; margin-top: 12px; min-width: 180px } input[type=range]::-webkit-slider-runnable-track { width: 100%; height: 18px; cursor: pointer; box-shadow: 2px 2px 3px #111111; background: #50555C; border-radius: 2px; border: 0px solid #222222; } input[type=range]::-webkit-slider-thumb { box-shadow: 2px 2px 3px #111111; border: 0px solid #000000; height: 18px; width: 40px; border-radius: 2px; background: var(--highlight-color); cursor: pointer; -webkit-appearance: none; margin-top: 0px; } ::-webkit-scrollbar { width: 12px; } @@ -22,8 +22,8 @@ div.gradio-container.dark > div.w-full.flex.flex-col.min-h-screen > div { backgr .dark .bg-gray-200, .dark .\!bg-gray-200 { background-color: transparent; } .dark .bg-white { color: lightyellow; border-radius: 0; background-color: var(--inactive-color); } .dark .dark\:bg-gray-900 { background-color: black; } -.dark .gr-box { border-radius: 0 !important; background-color: #111111; box-shadow: 2px 2px 3px #111111; border-width: 0; padding: 4px; margin-bottom: 4px; } -.dark .gr-button { border-radius: 0; font-weight: normal; box-shadow: 2px 2px 3px #111111; font-size: 0.9rem; min-width: 36px; min-height: 36px; padding: 6px; } +.dark .gr-box { border-radius: 0 !important; background-color: #111111; box-shadow: 2px 2px 3px #111111; border-width: 0; padding: 4px; margin: 8px 0px 8px 0px } +.dark .gr-button { border-radius: 0; font-weight: normal; box-shadow: 2px 2px 3px #111111; font-size: 0.8rem; min-width: 32px; min-height: 32px; padding: 3px; margin: 3px; } .dark .gr-check-radio { background-color: var(--inactive-color); border-width: 0; border-radius: 2px; box-shadow: 2px 2px 3px #111111; } .dark .gr-check-radio:checked { background-color: var(--highlight-color); } .dark .gr-compact { border-radius: 0; background-color: black; } @@ -32,13 +32,13 @@ div.gradio-container.dark > div.w-full.flex.flex-col.min-h-screen > div { backgr .dark .gr-input-label { color: lightyellow; border-width: 0; background: transparent; padding: 2px !important; } .dark .gr-panel { border-radius: 0; background-color: black; } .dark { background-color: black; } -.dark fieldset span.text-gray-500, .dark .gr-block.gr-box span.text-gray-500, .dark label.block span { background-color: #222222; padding: 0 12px 0 12px; } +.dark fieldset span.text-gray-500, .dark .gr-block.gr-box span.text-gray-500, .dark label.block span { background-color: #222222; padding: 0; margin-top: -4px; } .dark fieldset span.text-gray-500, .dark .gr-block.gr-box span.text-gray-500, .dark label.block span { border-radius: 0;} .extra-network-cards .card { width: 10em; height: 10em; box-shadow: none; } .extra-network-cards .card:hover { transform: scale(2); transition: all 0.3s ease; z-index: 99; box-shadow: none; } .extra-network-cards .card .actions .name { font-weight: 400; font-size: 1.2rem; } .gap-2 { padding-top: 8px; } -.gr-box > div > div > input.gr-text-input { right: 0.8rem; width: 5em; } +.gr-box > div > div > input.gr-text-input { right: 0.2rem; width: 5em; } .overflow-hidden .flex .flex-col .relative col .gap-4 { min-width: var(--left-column); max-width: var(--left-column); } /* this is a problematic one */ .p-2 { padding: 0; } .px-4 { padding-lefT: 1rem; padding-right: 1rem; } @@ -58,19 +58,23 @@ div.gradio-container.dark > div.w-full.flex.flex-col.min-h-screen > div { backgr #img2img_prompt > label > textarea { font-size: 1.2rem; } #interrogate, #deepbooru { margin: 0em 0 0 0.25em; } #save-animation { border-radius: 0 !important; margin-bottom: 16px; background-color: #111111; } +#script_list { padding: 4px; margin-top: 20px; } #tab_extensions table { background-color: #222222; } +#txt2img_cfg_scale { min-width: 200px; } #txt2img_checkboxes, #img2img_checkboxes { background-color: transparent; } +#txt2img_checkboxes, #img2img_checkboxes { margin-bottom: 0.2em; } #txt2img_gallery, #img2img_gallery, #extras_gallery { background: black; } -#txt2img_generate, #img2img_generate, #txt2img_interrupt, #img2img_interrupt, #txt2img_skip, #img2img_skip { margin-left: 10px; min-height: 2rem; height: 2rem; max-width: 200px; margin-top: 12px; border: none; border-radius: 0; } +#txt2img_generate, #img2img_generate, #txt2img_interrupt, #img2img_interrupt, #txt2img_skip, #img2img_skip { margin-left: 10px; min-height: 2rem; height: 2rem; max-width: 212px; margin-top: 12px; border: none; border-radius: 0; } #txt2img_interrupt, #img2img_interrupt, #txt2img_skip, #img2img_skip { background-color: var(--inactive-color); } #txt2img_neg_prompt > label > textarea { font-size: 1.2rem; } #txt2img_progress_row > div { min-width: var(--left-column); max-width: var(--left-column); } #txt2img_prompt > label > textarea { font-size: 1.2rem; } #txt2img_results, #img2img_results, #extras_results { background-color: black; } #txt2img_seed_row { padding: 0; margin-top: 8px; } -#txt2img_settings, #img2img_settings { min-width: var(--left-column); max-width: var(--left-column); background-color: #111111; margin-top: 1rem; } -#txt2img_subseed_show { min-width: 74px; padding: 0 0 0 6px; } -#txtimg_hr_finalres { max-width: 200px; } +#txt2img_settings, #img2img_settings { min-width: var(--left-column); max-width: var(--left-column); background-color: #111111; padding-top: 16px; } +#txt2img_subseed_row { padding: 0; margin-top: 16px; } +#txt2img_subseed_show { min-width: 74px; padding: 8px 0 0 0 } +#txt2img_subseed_strength { margin-top: 0; } #txt2img_tools, #img2img_tools { margin-left: 8px; } -#txt2img_checkboxes, #img2img_checkboxes { margin-bottom: 0.2em; } -#refresh_txt2img_styles, #refresh_img2img_styles, #open_folder_txt2img, #open_folder_img2img, #open_folder_extras, #footer, #style_pos_col, #style_neg_col, #roll_col, #save_zip_txt2img, #save_zip_img2img, #extras_upscaler_2, #extras_upscaler_2_visibility, #txt2img_res_switch_btn { display: none; } +#txtimg_hr_finalres { max-width: 200px; } +#refresh_txt2img_styles, #refresh_img2img_styles, #open_folder_txt2img, #open_folder_img2img, #open_folder_extras, #footer, #style_pos_col, #style_neg_col, #roll_col, #save_zip_txt2img, #save_zip_img2img, #extras_upscaler_2, #extras_upscaler_2_visibility, #txt2img_res_switch_btn, #img2img_res_switch_btn, #txt2img_seed_resize_from_w, #txt2img_seed_resize_from_h, #txt2img_subseed_show, #txt2img_reuse_seed, #txt2img_reuse_subseed, #txt2img_tiling, #img2img_subseed_show { display: none; }