rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SillyTavern:staging' into staging

Browse Source
This commit is contained in:
Tony Ribeiro
2023-08-25 00:45:34 +02:00
committed by GitHub
parent 74a6e79df6 3c0d7d8feb
commit a622810c38
16 changed files with 139 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/scripts/extensions/cfg/util.js
View File

@@ -57,7 +57,6 @@ export function getCfgPrompt(guidanceScale, isNegative) {
substituteParams(
chat_metadata[isNegative ? metadataKeys.negative_prompt : metadataKeys.positive_prompt]
)
?.trim()
);
}
@@ -67,7 +66,6 @@ export function getCfgPrompt(guidanceScale, isNegative) {
substituteParams(
isNegative ? charaCfg.negative_prompt : charaCfg.positive_prompt
)
?.trim()
);
}
@@ -76,7 +74,6 @@ export function getCfgPrompt(guidanceScale, isNegative) {
substituteParams(
isNegative ? extension_settings.cfg.global.negative_prompt : extension_settings.cfg.global.positive_prompt
)
?.trim()
);
}

6
public/scripts/extensions/expressions/style.css
View File

@@ -6,13 +6,13 @@
#expression-wrapper {
display: flex;
height: calc(100vh - 40px);
height: calc(100vh - var(--topBarBlockSize));
width: 100vw;
}
#visual-novel-wrapper {
display: flex;
height: calc(100vh - 40px);
height: calc(100vh - var(--topBarBlockSize));
width: 100vw;
position: relative;
overflow: hidden;
@@ -180,4 +180,4 @@ img.expression.default {
div.expression {
display: none;
}
}
}