Merge branch 'UI2' into UI2

This commit is contained in:
one-some
2022-09-30 19:28:21 -05:00
committed by GitHub
4 changed files with 16 additions and 12 deletions

View File

@@ -1121,7 +1121,7 @@ body {
@media only screen and (min-aspect-ratio: 7/5) { @media only screen and (min-aspect-ratio: 7/5) {
/* ------------------- Desktop Mode --------------------------- */ /* ------------------- Desktop Mode --------------------------- */
.main-grid { .main-grid {
transition: margin-left .5s; transition: margin-left .5s, margin-right .5s;
display: grid; display: grid;
height: 98vh; height: 98vh;
margin-left: var(--setting_menu_closed_width_no_pins_width); margin-left: var(--setting_menu_closed_width_no_pins_width);
@@ -1135,13 +1135,13 @@ body {
.main-grid.settings_pinned { .main-grid.settings_pinned {
margin-left: var(--flyout_menu_width); margin-left: var(--flyout_menu_width);
grid-template-columns: 30px auto var(--story_options_size) 30px; *grid-template-columns: 30px auto var(--story_options_size) 30px;
} }
.main-grid.story_pinned { .main-grid.story_pinned {
margin-left: var(--flyout_menu_closed_width);
margin-right: var(--flyout_menu_width); 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-areas: var(--story_pinned_areas);
grid-template-columns: var(--story_pinned_area_widths); grid-template-columns: var(--story_pinned_area_widths);*/
} }
.main-grid.settings_pinned.story_pinned { .main-grid.settings_pinned.story_pinned {
margin-left: var(--flyout_menu_width); margin-left: var(--flyout_menu_width);

View File

@@ -155,8 +155,14 @@ function reset_story() {
on_new_wi_item = null; on_new_wi_item = null;
current_chunk_number = null; current_chunk_number = null;
var story_area = document.getElementById('Selected Text'); var story_area = document.getElementById('Selected Text');
while (story_area.lastChild.id != 'story_prompt') { let temp = []
story_area.removeChild(story_area.lastChild); for (child of story_area.children) {
if (child.id != 'story_prompt') {
temp.push(child);
}
}
for (const item of temp) {
item.remove();
} }
dummy_span = document.createElement("div"); dummy_span = document.createElement("div");
dummy_span.id = "Delete Me"; dummy_span.id = "Delete Me";

View File

@@ -14,16 +14,14 @@
<link rel="stylesheet" href="static/bootstrap-toggle.min.css"> <link rel="stylesheet" href="static/bootstrap-toggle.min.css">
<link rel="stylesheet" href="static/bootstrap.min.css"> <link rel="stylesheet" href="static/bootstrap.min.css">
<script src="static/jquery-3.6.0.min.js"></script> <script src="static/jquery-3.6.0.min.js"></script>
<!--<script src="static/jquery-ui.sortable.min.js"></script>--> <script src="static/bootstrap-toggle.min.js"></script>
<!--<script src="static/bootstrap.min.js"></script>-->
<<script src="static/bootstrap-toggle.min.js"></script>
<script src="static/socket.io.min.js"></script> <script src="static/socket.io.min.js"></script>
<title>KoboldAI Client</title> <title>KoboldAI Client</title>
<meta charset="utf-8"> <meta charset="utf-8">
<link href="themes/Monochrome.css" rel="stylesheet" id="CSSTheme"> <link href="themes/Monochrome.css" rel="stylesheet" id="CSSTheme">
<link href="static/koboldai.css" rel="stylesheet"> <link href="static/koboldai.css" rel="stylesheet">
<script defer src="static/koboldai.js"></script> <script defer src="static/koboldai.js"></script>
<script defer src="static/favicon.js"></script> <script src="static/favicon.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
</head> </head>
<body> <body>

View File

@@ -188,8 +188,8 @@
"menuicon inputrow inputrow lefticon"; "menuicon inputrow inputrow lefticon";
--story_pinned_area_widths_left: 30pxvar(--story_options_size) auto 30px; --story_pinned_area_widths_left: 30pxvar(--story_options_size) auto 30px;
--story_pinned_area_widths_right: 30pxautovar(--story_options_size) 30px; --story_pinned_area_widths_right: 30pxautovar(--story_options_size) 30px;
--story_pinned_areas:var(--story_pinned_areas_left); --story_pinned_areas: var(--story_pinned_areas_left);
--story_pinned_area_widths:var(--story_pinned_area_widths_left); --story_pinned_area_widths: var(--story_pinned_area_widths_left);
--font_size_adjustment: 0px; --font_size_adjustment: 0px;
--game_screen_font_size_adjustment: 1;} --game_screen_font_size_adjustment: 1;}