diff --git a/aiserver.py b/aiserver.py index 6a451f56..b2b47bbf 100644 --- a/aiserver.py +++ b/aiserver.py @@ -7471,10 +7471,11 @@ def UI_2_load_userscripts_list(data): column_widths=['200px', '150px', 'auto']) def valid_userscripts_to_load(file): - return file.endswith(".lua") and file not in koboldai_vars.userscripts + print("{} is valid: {}".format(file, file.endswith(".lua") and os.path.basename(file) not in koboldai_vars.userscripts)) + return file.endswith(".lua") and os.path.basename(file) not in koboldai_vars.userscripts def valid_userscripts_to_unload(file): - return file.endswith(".lua") and file in koboldai_vars.userscripts + return file.endswith(".lua") and os.path.basename(file) in koboldai_vars.userscripts def get_userscripts_desc(item_full_path, item, valid_selection): if not valid_selection: diff --git a/static/koboldai.css b/static/koboldai.css index baf89037..b666176f 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -232,6 +232,24 @@ input[type="range"]::-ms-fill-upper { margin-left: 10px; } +.setting_container_single_wide { + display: grid; + grid-template-areas: "label" + "item"; + grid-template-rows: 20px auto; + grid-template-columns: 354px; + row-gap: 0.2em; + background-color: var(--setting_background); + color: var(--text); + border-radius: var(--radius_settings_background); + padding: 3px; + margin: 2px; +} +.setting_container_single_wide .setting_item{ + font-size: calc(0.93em + var(--font_size_adjustment)); + margin-left: 10px; +} + .setting_minlabel { padding-top: 6px; @@ -1051,7 +1069,7 @@ body { background-color: var(--gamescreen_background); z-index: 2; box-shadow: var(--light_shadow_value); - color: white; + color: var(--text); width: 100%; grid-area: gamescreen; display: flex; diff --git a/static/koboldai.js b/static/koboldai.js index c8860143..42799f46 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -645,7 +645,7 @@ function popup_items(data) { for (i=0; i < data.column_widths.length; i++) { style = style + " p"+i; } - style = style + '"; grid-template-columns: 30px'; + style = style + '"; grid-template-columns: 50px'; for (column_width of data.column_widths) { style = style + " "+column_width; } diff --git a/templates/settings flyout.html b/templates/settings flyout.html index 6e5990fb..c4fb2899 100644 --- a/templates/settings flyout.html +++ b/templates/settings flyout.html @@ -177,18 +177,20 @@ -