diff --git a/static/koboldai.css b/static/koboldai.css index 44ffeedc..6b6fa3ea 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -1141,28 +1141,26 @@ body { grid-template-areas: "menuicon gamescreen options lefticon" "menuicon theme theme lefticon" "menuicon inputrow inputrow lefticon"; - grid-template-columns: 30px auto var(--story_options_size) 30px; + grid-template-columns: 30px auto fit-content(30%) 30px; grid-template-rows: auto min-content 100px; } +.main-grid[option_length="0"][model_numseqs="1"] { + grid-template-columns: 30px auto 0px 30px; +} .main-grid.settings_pinned { margin-left: var(--flyout_menu_width); - *grid-template-columns: 30px auto var(--story_options_size) 30px; } + .main-grid.story_pinned { margin-right: var(--flyout_menu_width); - /*margin-left: var(--setting_menu_closed_width_no_pins_width); - grid-template-areas: var(--story_pinned_areas); - grid-template-columns: var(--story_pinned_area_widths);*/ } .main-grid.settings_pinned.story_pinned { margin-left: var(--flyout_menu_width); margin-right: var(--flyout_menu_width); - grid-template-areas: "menuicon gamescreen options lefticon" - "menuicon theme theme lefticon" - "menuicon inputrow inputrow lefticon"; - grid-template-columns: 30px auto var(--story_options_size) 30px; } + + } @media only screen and (max-aspect-ratio: 7/5) { diff --git a/static/koboldai.js b/static/koboldai.js index a531eff6..03a74888 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -211,6 +211,7 @@ function fix_text(val) { function create_options(action) { //Set all options before the next chunk to hidden + document.getElementById('main-grid').setAttribute('option_length', action.action.Options.length); var option_container = document.getElementById("Select Options"); var current_chunk = parseInt(document.getElementById("action_count").textContent)+1; if (current_chunk != action.id.toString()) { @@ -757,17 +758,17 @@ function var_changed(data) { } //if we changed the gen amount, make sure our option area is set/not set - if ((data.classname == 'model') && (data.name == 'numseqs')) { - if (data.value == 1) { - //allow our options to collapse to 0%, but no more than 30% (in case there is a redo or the like) - var r = document.querySelector(':root'); - r.style.setProperty('--story_options_size', 'fit-content(30%)'); - } else { - //static 30% - var r = document.querySelector(':root'); - r.style.setProperty('--story_options_size', '30%'); - } - } + //if ((data.classname == 'model') && (data.name == 'numseqs')) { + // if (data.value == 1) { + // //allow our options to collapse to 0%, but no more than 30% (in case there is a redo or the like) + // var r = document.querySelector(':root'); + // r.style.setProperty('--story_options_size', 'fit-content(30%)'); + // } else { + // //static 30% + // var r = document.querySelector(':root'); + // r.style.setProperty('--story_options_size', 'fit-content(30%)'); + // } + //} //if we're updating generated tokens, let's show that in our status bar if ((data.classname == 'model') && (data.name == 'tqdm_progress')) { diff --git a/templates/index_new.html b/templates/index_new.html index 8e3bdace..599a7444 100644 --- a/templates/index_new.html +++ b/templates/index_new.html @@ -41,7 +41,7 @@ -