@@ -3034,7 +3034,7 @@
@@ -3061,7 +3061,7 @@
diff --git a/public/style.css b/public/style.css
index ed094e647..3dcbbe9fb 100644
--- a/public/style.css
+++ b/public/style.css
@@ -438,6 +438,8 @@ width: 100%;
size: 10;
font-size: 11pt;
padding: 7px;
+ width:90%;
+ margin-bottom:5px;
}
@@ -1473,10 +1475,20 @@ input[type="range"] {
}
#your_name_button {
- opacity: 0.5;
+ cursor: pointer;
+ color: #fff;
+ opacity: 0.7;
+ padding: 10px;
margin-left: 10px;
- cursor: pointer;
+ margin-top: 10px;
+ margin: 10px;
+ font-size: 1rem;
+ height: 2.5rem;
+ transition: 0.3s;
}
+
+#your_name_button:hover{background-color:green;}
+
#form_change_name{
margin-bottom: 15px;
}
From e16b1d533b28ce5c5fd29244e61ea48941a91832 Mon Sep 17 00:00:00 2001
From: RossAsscends <124905043+RossAscends@users.noreply.github.com>
Date: Wed, 1 Mar 2023 04:42:07 +0900
Subject: [PATCH 09/12] nav-toggle transparency
fixed the transparency on the new nav-toggle setup.
---
public/style.css | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/public/style.css b/public/style.css
index 3dcbbe9fb..0b5ebf97f 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1921,8 +1921,8 @@ a {
padding: 0px;
margin: 0px;
cursor: pointer;
- height: 15px;
- width: 15px;
+ height: 0;
+ width: 0;
z-index: 3001;
}
@@ -1941,10 +1941,10 @@ a {
width: 30px;
height: 30px;
margin-top: -8px;
- margin-left: -9px;
+ margin-left: -24px;
border: 1px solid #666;
border-radius: 5px;
- background: rgba(0, 0, 0, 1);
+ background: rgba(0, 0, 0, 0.3);
color: #666;
-webkit-transition: all 0.275s;
transition: all 0.275s;
From db19ccb0f00b9db89cd8f8b899d98acff55127e6 Mon Sep 17 00:00:00 2001
From: RossAsscends <124905043+RossAscends@users.noreply.github.com>
Date: Wed, 1 Mar 2023 05:38:02 +0900
Subject: [PATCH 10/12] added panel lock to rightnav
Added a lock/unlock toggle to the right nav which will function to pin the panel in place (disengages auto-close) if the user desires it.
---
public/index.html | 6 +++--
public/style.css | 67 ++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 64 insertions(+), 9 deletions(-)
diff --git a/public/index.html b/public/index.html
index fb8ec9072..df2109bcd 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1905,9 +1905,10 @@
// RossAscends: Added functionality that will close the RightNav panels when User clicks outside them
var NavToggle = document.getElementById("nav-toggle");
+ var PanelPin = document.getElementById("rm_button_panel_pin");
$('document').ready(function(){
$("html").click(function(e){
- if (NavToggle.checked === true){
+ if (NavToggle.checked === true && PanelPin.checked === false) {
if ($(e.target).attr('id') !== "nav-toggle") {
if (document.querySelector('#right-nav-panel').contains(e.target) === false){
document.getElementById('nav-toggle').click();
@@ -2962,8 +2963,9 @@
+
-
diff --git a/public/style.css b/public/style.css
index 2adc85c8b..dff01cab1 100644
--- a/public/style.css
+++ b/public/style.css
@@ -550,7 +550,7 @@ input[type=button] {
}
#rm_button_panel_pin:hover::after {
- color: #f4f4f4;
+ filter: grayscale(1) brightness(150%);
}
#rm_button_panel_pin::after {
From dac14985f41c63a40161fdb60fc370c07b69e883 Mon Sep 17 00:00:00 2001
From: RossAsscends <124905043+RossAscends@users.noreply.github.com>
Date: Wed, 1 Mar 2023 16:34:04 +0900
Subject: [PATCH 12/12] fixed bug with ctrl+enter
previously the keydown eventlistener for 'enter' would trigger even though ctrl was pressed, so i changed it so it doesn't trigger when ctrl is pressed (previously it only checked if shift was not pressed)
---
public/index.html | 45 +++++++++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/public/index.html b/public/index.html
index 252468c5d..4df705935 100644
--- a/public/index.html
+++ b/public/index.html
@@ -605,23 +605,24 @@
tokens_already_generated = 0;
message_already_generated = name2+': ';
if(online_status != 'no_connection' && this_chid != undefined){
- if(type != 'regenerate'){
+ if(type !== 'regenerate'){
var textareaText = $("#send_textarea").val();
+ //console.log('Not a Regenerate call, so posting normall with input of: ' +textareaText);
$("#send_textarea").val('').trigger('input');
}else{
+ //console.log('Regenerate call detected')
var textareaText = "";
if(chat[chat.length-1]['is_user']){//If last message from You
}else{
+ //console.log('about to remove last msg')
chat.length = chat.length-1;
count_view_mes-=1;
+ //console.log('removing last msg')
$('#chat').children().last().remove();
}
}
- //$("#send_textarea").attr("disabled","disabled");
-
- //$("#send_textarea").blur();
$( "#send_but" ).css("display", "none");
$( "#loading_mes" ).css("display", "inline-block");
@@ -807,7 +808,6 @@
//arrMes[arrMes.length-1] = '
\n'+arrMes[arrMes.length-1];
let mesExmString = '';
for(let iii = 0; iii < mesExamplesArray.length; iii++){//mesExamplesArray It need to make from end to start
-
mesExmString = mesExmString+mesExamplesArray[iii];
if(encode(JSON.stringify(storyString+mesExmString+chatString+anchorTop+anchorBottom+charPersonality)).length+120 < this_max_context){ //example of dialogs
if(!is_pygmalion){
@@ -936,6 +936,7 @@
mesSendString = '\nThen the roleplay chat between '+name1+' and '+name2+' begins.\n'+mesSendString;
}else{
mesSendString = '\n'+mesSendString;
+ //mesSendString = mesSendString;
}
finalPromt = storyString+mesExmString+mesSendString+generatedPromtCache;
@@ -1223,13 +1224,29 @@
//maybe a way to simulate this would be to disable the eventListener for people iOS.
$("#send_textarea").keydown(function (e) {
- if(e.which === 13 && !e.shiftKey && is_send_press == false) {
+ if(e.which === 13 && !e.shiftKey && !e.ctrlKey && is_send_press == false) {
is_send_press = true;
e.preventDefault();
Generate();
//$(this).closest("form").submit();
}
});
+
+ //RossAscends: Lets add some hotkeys
+ document.addEventListener('keydown', (event) => {
+ //console.log(event.key);
+ if(event.ctrlKey && event.key == "Enter") { // Ctrl+Enter for Regeneration Last Response
+ //console.log('both CTRL and Enter were pressed');
+ if(is_send_press == false){
+ is_send_press = true;
+ Generate('regenerate');
+ //console.log('confirmed keypress was caught '+ event.key);
+ }
+ }else if(event.ctrlKey && event.key == "ArrowUp") { //Ctrl+UpArrow for Connect to last server
+ document.getElementById('api_button').click();
+
+ }
+ });
//menu buttons
var selected_button_style = { color: "#bcc1c8" };
@@ -1947,26 +1964,14 @@
callPopup('Start new chat?
');
}
});
- //RossAscends: Lets add some hotkeys
- document.addEventListener('keydown', (event) => {
- if(event.ctrlKey && event.key == "Enter") { // Ctrl+Enter for Regeneration Last Response
- if(is_send_press == false){
- is_send_press = true;
- Generate('regenerate');
- }
- }else if(event.ctrlKey && event.key == "ArrowUp") { //Ctrl+UpArrow for Connect to last server
- document.getElementById('api_button').click();
-
- }
- });
-
+
$( "#option_regenerate" ).click(function() {
if(is_send_press == false){
is_send_press = true;
Generate('regenerate');
}
});
- // this function hides the input form, and shows the delete/cancel buttons fro deleting messages from chat
+ // this function hides the input form, and shows the delete/cancel buttons for deleting messages from chat
$( "#option_delete_mes" ).click(function() {
if(this_chid != undefined && !is_send_press){
$('#dialogue_del_mes').css('display','block');