Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

public/script.js

@@ -164,10 +164,10 @@ window["TavernAI"] = {};
 let converter = new showdown.Converter({ emoji: "true" });
 const gpt3 = new GPT3BrowserTokenizer({ type: 'gpt3' });
 /* let bg_menu_toggle = false; */
-const systemUserName = "TavernAI";
+const systemUserName = "SillyTavern System";
 let default_user_name = "You";
 let name1 = default_user_name;
-let name2 = "TavernAI";
+let name2 = "SillyTavern System";
 let chat = [];
 let safetychat = [
     {
@@ -249,13 +249,13 @@ const system_messages = {
         is_user: false,
         is_name: true,
         mes: [
-            'Welcome to TavernAI! In order to begin chatting:',
-            '<ul>',
-            '<li>Connect to one of the supported generation APIs</li>',
-            '<li>Create or pick a character from the list</li>',
-            '</ul>',
+            'Welcome to SillyTavern! In order to begin chatting:',
+            '<ol>',
+            '<li>Connect to one of the supported generation APIs (the plug icon)</li>',
+            '<li>Create or pick a character from the list (the top-right namecard icon)</li>',
+            '</ol>',
             "<h4>Running on Colab and can't get an answer from the AI or getting Out of Memory errors?</h4>",
-            'Set a lower Context Size in AI generation settings.<br>Values in range of 1400-1600 Tokens would be the safest choice.',
+            'Set a lower Context Size in AI generation settings (leftmost icon).<br>Values in range of 1400-1600 Tokens would be the safest choice.',
             '<h4>Still have questions left?</h4>',
             'Check out built-in help or type <tt>/?</tt> in any chat.'
         ].join('')
@@ -1661,7 +1661,7 @@ async function Generate(type, automatic_trigger, force_name2) {
                         is_add_personality = true;
                         //chatString = chatString.substr(0,chatString.length-1);
                         //anchorAndPersonality = "[Genre: roleplay chat][Tone: very long messages with descriptions]";
-                        let personalityAndAnchor = [ charPersonality, anchorTop ].filter(x => x).join(' ');
+                        let personalityAndAnchor = [charPersonality, anchorTop].filter(x => x).join(' ');
                         if (personalityAndAnchor && !is_pygmalion) {
                             item += "[" + personalityAndAnchor + ']\n';
                         }

public/style.css

@@ -3489,11 +3489,11 @@ body.movingUI #expression-holder {
     }
 
 
-    #send_textarea {
-        font-size: calc(var(--mainFontSize) + .25rem);
-        line-height: calc(var(--mainFontSize) + .5rem);
-        min-height: calc(2rem + 0.75rem + 2px);
-        max-height: 200px;
+    /*     #send_textarea {
+                 font-size: calc(var(--mainFontSize));
+        line-height: calc(var(--mainFontSize));
+        min-height: calc(2rem + 0.75rem + 2px); 
+                 max-height: 200px;
         word-wrap: break-word;
         height: 40px;
         resize: vertical;
@@ -3505,7 +3505,7 @@ body.movingUI #expression-holder {
         font-family: "Noto Sans", "Noto Color Emoji", sans-serif;
         margin: 0;
         text-shadow: #000 0 0 3px;
-    }
+    } */
 
     #rm_ch_create_block textarea {
         max-height: 200px;