From 6252f6673b4f4d41a1359374f9937f3f71735ff5 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Wed, 20 Mar 2024 15:01:51 -0400 Subject: [PATCH] pre gallery cleanup --- javascript/sdnext.css | 15 ++++++++++++--- modules/shared.py | 1 + modules/ui_symbols.py | 8 ++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/javascript/sdnext.css b/javascript/sdnext.css index 8d9e57ef9..7806500ec 100644 --- a/javascript/sdnext.css +++ b/javascript/sdnext.css @@ -29,8 +29,6 @@ input[type='color'] { width: 64px; height: 32px; } .tabitem { padding: 0 !important; } /* color elements */ - - .gradio-dropdown, .block.gradio-slider, .block.gradio-checkbox, .block.gradio-textbox, .block.gradio-radio, .block.gradio-checkboxgroup, .block.gradio-number, .block.gradio-colorpicker { border-width: 0 !important; box-shadow: none !important;} .gradio-accordion { padding-top: var(--spacing-md) !important; padding-right: 0 !important; padding-bottom: 0 !important; color: var(--body-text-color); } .gradio-accordion .label-wrap .icon { color: var(--button-primary-border-color); } @@ -38,7 +36,7 @@ input[type='color'] { width: 64px; height: 32px; } .gradio-button.secondary-down { background: var(--button-secondary-background-fill); color: var(--button-secondary-text-color); } .gradio-button.secondary-down, .gradio-button.secondary-down:hover { box-shadow: 1px 1px 1px rgba(0,0,0,0.25) inset, 0px 0px 3px rgba(0,0,0,0.15) inset; } .gradio-button.secondary-down:hover { background: var(--button-secondary-background-fill-hover); color: var(--button-secondary-text-color-hover); } -.gradio-button.tool { max-width: min-content; min-width: min-content !important; align-self: end; font-size: 20px !important; color: var(--body-text-color) !important; align-self: end; margin-bottom: 8px; } +.gradio-button.tool { max-width: min-content; min-width: min-content !important; align-self: end; font-size: 20px !important; color: var(--body-text-color) !important; align-self: end; } .gradio-checkbox { margin: 0.75em 1.5em 0 0; align-self: center; } .gradio-column { min-width: min(160px, 100%) !important; } .gradio-container { max-width: unset !important; padding: var(--block-label-padding) !important; } @@ -291,6 +289,17 @@ table.settings-value-table td { padding: 0.4em; border: 1px solid #ccc; max-widt .main-info { font-weight: var(--section-header-text-weight); color: var(--body-text-color-subdued); padding: 1em !important; margin-top: 2em !important; line-height: var(--line-lg) !important; } .update-status { margin: 1em; line-height: 1.5em; } +/* image gallery */ +#tab-gallery-folders { width: max-content; } +#tab-gallery-files { display: block; overflow-x: hidden !important; overflow-y: auto !important; height: 75vh; } +#tab-gallery-image { height: 100%; } +#tab-gallery-search { padding: 0; } +#tab-gallery-search textarea { height: 42px !important; } +#tab-gallery-sortby { padding: 0; } +#tab-gallery-status { align-content: center; text-align: right; background: var(--input-background-fill); padding-right: 1em; margin-left: -0.6em; color: var(--block-title-text-color); } +div:has(>#tab-gallery-folders) { flex-grow: 0 !important; background-color: var(--input-background-fill); min-width: max-content !important; } +.gallery-separator { background-color: var(--input-background-fill); font-size: larger; padding: 0.5em; display: block !important; } + /* loader */ .splash { position: fixed; top: 0; left: 0; width: 100vw; height: 100vh; z-index: 1000; display: block; text-align: center; } .motd { margin-top: 2em; color: var(--body-text-color-subdued); font-family: monospace; font-variant: all-petite-caps; } diff --git a/modules/shared.py b/modules/shared.py index 69f1fba50..c18db3f93 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -531,6 +531,7 @@ options_templates.update(options_section(('saving-images', "Image Options"), { "image_sep_browser": OptionInfo("

Image Browser

", "", gr.HTML), "browser_folders": OptionInfo("", "Additional image browser folders"), + "browser_fixed_width": OptionInfo(False, "Use fixed with thumbnails"), "viewer_show_metadata": OptionInfo(True, "Show metadata in full screen image browser"), "save_sep_options": OptionInfo("

Intermediate Image Saving

", "", gr.HTML), diff --git a/modules/ui_symbols.py b/modules/ui_symbols.py index 5977cfeae..ff59973a6 100644 --- a/modules/ui_symbols.py +++ b/modules/ui_symbols.py @@ -29,6 +29,14 @@ mark_flag = '⁜' int_clip = '✎' int_blip = '✐' bullet = '⃝' +sort_alpha_asc = '\uf15d' +sort_alpha_dsc = '\uf15e' +sort_size_asc = '\uf160' +sort_size_dsc = '\uf161' +sort_num_asc = '\uf162' +sort_num_dsc = '\uf163' +sort_time_asc = '\uf0de' +sort_time_dsc = '\uf0dd' """ refresh = '🔄' close = '🛗'