Fix sidebar and textarea size

This commit is contained in:
kwaroran
2024-04-25 02:30:10 +09:00
parent f1dfabc408
commit 5bd57df411
11 changed files with 31 additions and 30 deletions

View File

@@ -28,12 +28,12 @@
<span class="text-textcolor text-lg">Jinja</span>
<TextAreaInput onInput={onInput} bind:value={input} height="32" />
<TextAreaInput onInput={onInput} bind:value={input} />
<span class="text-textcolor text-lg">Data (JSON)</span>
<TextAreaInput onInput={onInput} bind:value={json} height="32" />
<TextAreaInput onInput={onInput} bind:value={json} />
<span class="text-textcolor text-lg">Result</span>
<TextAreaInput value={output} height="32" />
<TextAreaInput value={output} />

View File

@@ -20,8 +20,8 @@
<span class="text-textcolor text-lg">Input</span>
<TextAreaInput onInput={onInput} bind:value={input} height="32" optimaizedInput={false} />
<TextAreaInput onInput={onInput} bind:value={input} optimaizedInput={false} />
<span class="text-textcolor text-lg">Result</span>
<TextAreaInput value={output} height="32" />
<TextAreaInput value={output} />

View File

@@ -22,10 +22,10 @@
<span class="text-textcolor text-lg">Input</span>
<TextAreaInput onInput={onInput} bind:value={input} height="32" optimaizedInput={false} />
<TextAreaInput onInput={onInput} bind:value={input} optimaizedInput={false} />
<span class="text-textcolor text-lg">Result</span>
<TextAreaInput value={output} height="32" />
<TextAreaInput value={output} />
<span class="text-textcolor2 text-lg">{outputLength} {language.tokens}</span>

View File

@@ -441,7 +441,7 @@
</div>
<span class="text-textcolor mt-2">{language.autoSuggest} <Help key="autoSuggest"/></span>
<TextAreaInput fullwidth autocomplete="off" height={"32"} bind:value={$DataBase.autoSuggestPrompt} />
<TextAreaInput fullwidth autocomplete="off" bind:value={$DataBase.autoSuggestPrompt} />
<span class="text-textcolor2 mb-6 text-sm">{tokens.autoSuggest} {language.tokens}</span>
<span class="text-textcolor">{language.autoSuggest} Prefix</span>
@@ -525,7 +525,7 @@
<SliderInput min={0} max={1} step={0.01} bind:value={$DataBase.top_p}/>
<span class="text-textcolor2 mb-6 text-sm">{($DataBase.top_p).toFixed(2)}</span>
<span class="text-textcolor mt-2">{language.autoSuggest} <Help key="autoSuggest"/></span>
<TextAreaInput height="20" autocomplete="off" bind:value={$DataBase.autoSuggestPrompt} />
<TextAreaInput autocomplete="off" bind:value={$DataBase.autoSuggestPrompt} />
<span class="text-textcolor2 mb-6 text-sm">{tokens.autoSuggest} {language.tokens}</span>
{:else}
@@ -542,7 +542,7 @@
<span class="text-textcolor2 mb-6 text-sm">{($DataBase.PresensePenalty / 100).toFixed(2)}</span>
<span class="text-textcolor mt-2">{language.autoSuggest} <Help key="autoSuggest"/></span>
<TextAreaInput height="20" autocomplete="off" bind:value={$DataBase.autoSuggestPrompt} />
<TextAreaInput autocomplete="off" bind:value={$DataBase.autoSuggestPrompt} />
<span class="text-textcolor2 mb-6 text-sm">{tokens.autoSuggest} {language.tokens}</span>
{/if}
{/if}

View File

@@ -21,5 +21,5 @@
{#if $DataBase.instructChatTemplate === 'jinja'}
<span class="text-textcolor">Jinja Template</span>
<TextAreaInput fullwidth autocomplete="off" height={"24"} bind:value={$DataBase.JinjaTemplate} />
<TextAreaInput fullwidth autocomplete="off" bind:value={$DataBase.JinjaTemplate} />
{/if}

View File

@@ -82,7 +82,7 @@
<span class="text-sm text-textcolor2">{language.name}</span>
<TextInput marginBottom size="lg" placeholder="User" bind:value={$DataBase.username} />
<span class="text-sm text-textcolor2">{language.description}</span>
<TextAreaInput height="32" autocomplete="off" bind:value={$DataBase.personaPrompt} placeholder={`Put the description of this persona here.\nExample: [<user> is a 20 year old girl.]`} />
<TextAreaInput autocomplete="off" bind:value={$DataBase.personaPrompt} placeholder={`Put the description of this persona here.\nExample: [<user> is a 20 year old girl.]`} />
<div class="flex gap-2 mt-4 max-w-full flex-wrap">
<Button on:click={exportUserPersona}>{language.export}</Button>
<Button on:click={importUserPersona}>{language.import}</Button>

View File

@@ -249,19 +249,19 @@
{/if}
{#if effect.type === 'systemprompt'}
<span class="text-textcolor2 text-sm">{language.location}</span>
<SelectInput bind:value={effect.location} size="sm">
<SelectInput bind:value={effect.location}>
<OptionInput value="start">{language.promptstart}</OptionInput>
<OptionInput value="historyend">{language.historyend}</OptionInput>
<OptionInput value="promptend">{language.promptend}</OptionInput>
</SelectInput>
<span class="text-textcolor2 text-sm">{language.value}</span>
<TextAreaInput size="sm" bind:value={effect.value} />
<TextAreaInput bind:value={effect.value} />
{/if}
{#if effect.type === 'setvar'}
<span class="text-textcolor2 text-sm">{language.varableName}</span>
<TextInput size="sm" bind:value={effect.var} />
<TextInput bind:value={effect.var} />
<span class="text-textcolor2 text-sm">{language.operator}</span>
<SelectInput bind:value={effect.operator} size="sm">
<SelectInput bind:value={effect.operator} >
<OptionInput value="=">{language.TriggerSetToVar}</OptionInput>
<OptionInput value="+=">{language.TriggerAddToVar}</OptionInput>
<OptionInput value="-=">{language.TriggerSubToVar}</OptionInput>
@@ -269,7 +269,7 @@
<OptionInput value="/=">{language.TriggerDivToVar}</OptionInput>
</SelectInput>
<span class="text-textcolor2 text-sm">{language.value}</span>
<TextInput size="sm" bind:value={effect.value} />
<TextInput bind:value={effect.value} />
{/if}
{#if effect.type === 'runtrigger'}
@@ -278,7 +278,7 @@
{/if}
{#if effect.type === 'command'}
<span class="text-textcolor2 text-sm">{language.value}</span>
<TextAreaInput size="sm" bind:value={effect.value} />
<TextAreaInput bind:value={effect.value} />
{/if}
{#if effect.type === 'impersonate'}
<span class="text-textcolor2 text-sm">{language.role}</span>
@@ -287,7 +287,7 @@
<OptionInput value="char">{language.character}</OptionInput>
</SelectInput>
<span class="text-textcolor2 text-sm">{language.value}</span>
<TextAreaInput size="sm" bind:value={effect.value} />
<TextAreaInput bind:value={effect.value} />
{/if}
{/each}
</div>

View File

@@ -620,12 +620,12 @@
class:w-96={$sideBarSize === 0}
class:w-110={$sideBarSize === 1}
class:w-124={$sideBarSize === 2}
class:w-144={$sideBarSize === 3}
class:w-138={$sideBarSize === 3}
class:risu-sidebar-close={$sideBarClosing}
class:min-w-96={!$DynamicGUI && $sideBarSize === 0}
class:min-w-110={!$DynamicGUI && $sideBarSize === 1}
class:min-w-124={!$DynamicGUI && $sideBarSize === 2}
class:min-w-144={!$DynamicGUI && $sideBarSize === 3}
class:min-w-138={!$DynamicGUI && $sideBarSize === 3}
class:px-2={$DynamicGUI}
class:px-4={!$DynamicGUI}
class:dynamic-sidebar={$DynamicGUI}
@@ -734,12 +734,12 @@
width: 0rem;
}
to {
width: 24rem;
width: var(--sidebar-size);
}
}
@keyframes sidebar-transition-close {
from {
width: 24rem;
width: var(--sidebar-size);
right:0rem;
}
to {
@@ -753,14 +753,14 @@
min-width: 0rem;
}
to {
width: 24rem;
min-width: 24rem;
width: var(--sidebar-size);
min-width: var(--sidebar-size);
}
}
@keyframes sidebar-transition-close-non-dynamic {
from {
width: 24rem;
min-width: 24rem;
width: var(--sidebar-size);
min-width: var(--sidebar-size);
right:0rem;
}
to {

View File

@@ -54,7 +54,7 @@
{/each}
</div>
{/if}
<TextAreaInput autocomplete="off" bind:value={valueObject[selectedLang]} height={"20"} onInput={() => {
<TextAreaInput autocomplete="off" bind:value={valueObject[selectedLang]} onInput={() => {
updateValue()
onInput()
}} className={className} />

View File

@@ -14,6 +14,7 @@ export function updateGuisize(){
textAreaSize.set(db.textAreaSize)
sideBarSize.set(db.sideBarSize)
textAreaTextSize.set(db.textAreaTextSize)
root.style.setProperty('--sidebar-size', (24 + (4 * db.sideBarSize)) + 'rem')
}
export function guiSizeText(num:number){