diff --git a/aiserver.py b/aiserver.py index a39c9bda..a049af1e 100644 --- a/aiserver.py +++ b/aiserver.py @@ -1908,6 +1908,7 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal global model_config global GPT2TokenizerFast global tokenizer + koboldai_vars.aibusy = True reset_model_settings() if not utils.HAS_ACCELERATE: disk_layers = None @@ -2622,6 +2623,7 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal to_use["Other"]['Official'].append(preset) koboldai_vars.presets = to_use + koboldai_vars.aibusy = False # Set up Flask routes @app.route('/') diff --git a/static/application.js b/static/application.js index c4149a29..6a956408 100644 --- a/static/application.js +++ b/static/application.js @@ -2291,6 +2291,7 @@ $(document).ready(function(){ // Connect to SocketIO server socket = io.connect(window.document.origin, {transports: ['polling', 'websocket'], closeOnBeforeunload: false, query:{"ui": "1"}}); + //console.log(socket); socket.on('load_popup', function(data){load_popup(data);}); socket.on('popup_items', function(data){popup_items(data);}); socket.on('popup_breadcrumbs', function(data){popup_breadcrumbs(data);}); diff --git a/static/koboldai.css b/static/koboldai.css index b5853190..bd51399f 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -837,7 +837,7 @@ body { } .main-grid.settings_pinned { margin-left: var(--flyout_menu_width); - grid-template-columns: 30px auto 30% 30px; + grid-template-columns: 30px auto var(--story_options_size) 30px; } .main-grid.story_pinned { margin-left: var(--flyout_menu_closed_width); @@ -1092,6 +1092,7 @@ body { .statusbar_inner { background-color: var(--statusbar_color); + color: var(--statusbar_text_color); border-radius: 5px; z-index: 0; height: 100%; diff --git a/themes/Material You.css b/themes/Material You.css index 0f4071b8..cc9291ae 100644 --- a/themes/Material You.css +++ b/themes/Material You.css @@ -44,6 +44,7 @@ --text_edit: var(--on_background_palette); --statusbar_color: #002d6ca1; + --statusbar_text_color: white; --scrollbar-color: #9b9b9b80; /*Buttons*/ diff --git a/themes/Monochrome.css b/themes/Monochrome.css index 60bd1a82..5eede915 100644 --- a/themes/Monochrome.css +++ b/themes/Monochrome.css @@ -43,6 +43,7 @@ --text_edit: #759bc5; --statusbar_color: #002d6ca1; + --statusbar_text_color: white; --scrollbar-color: #3e536780; /*Buttons*/