From eb8e1d31c8eec049e96a909d1ec2fb396d086b71 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Mon, 9 Sep 2024 18:47:30 +0900 Subject: [PATCH] Add custom css and rs classes for it --- src/lang/en.ts | 2 ++ src/lib/Others/WelcomeRisu.svelte | 4 +-- src/lib/Setting/Pages/DisplaySettings.svelte | 28 ++++++++++++-------- src/lib/Setting/Settings.svelte | 8 +++--- src/lib/SideBars/Sidebar.svelte | 2 +- src/ts/gui/colorscheme.ts | 11 +++++++- src/ts/hotkey.ts | 10 ++++++- src/ts/storage/database.ts | 2 ++ src/ts/storage/globalApi.ts | 4 +-- src/ts/stores.ts | 18 +++++++++++++ 10 files changed, 67 insertions(+), 22 deletions(-) diff --git a/src/lang/en.ts b/src/lang/en.ts index cb866e62..76144415 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -143,6 +143,7 @@ export const languageEnglish = { urllora: "You can use direct download link of the model file. you can make direct url from google drive like website like https://sites.google.com/site/gdocs2direct/ , or use civitai URL, copy the the AIR (looks like `urn:air:flux1:lora:civitai:180891@776656` or just `civitai:180891@776656`) and paste it.", namespace: "Namespace is a unique identifier for the module. it is used to prevent conflicts between modules, and for interaction of presets, other modules and etc. if you are not sure what to put, leave it blank.", moduleIntergration: "You can enable modules by putting the module namespace in the module intergartion sections. if you want to enable multiple modules, you can seperate them by comma. for example, `module1,module2,module3`. this is for advanced users, who wants to vary the use of modules by presets.", + customCSS: "Custom CSS for styling. you can also disable/enable it by pressing (Ctrl + .) if something goes wrong.", }, setup: { chooseProvider: "Choose AI Provider", @@ -703,4 +704,5 @@ export const languageEnglish = { miscTools: "Misc Tools", promptConvertion: "Prompt Convertion", convertionStep1: "Select all file related to the prompt (Context, Instruct and Sampler JSON is supported)", + customCSS: "Custom CSS", } \ No newline at end of file diff --git a/src/lib/Others/WelcomeRisu.svelte b/src/lib/Others/WelcomeRisu.svelte index 89e09b19..5d0902fb 100644 --- a/src/lib/Others/WelcomeRisu.svelte +++ b/src/lib/Others/WelcomeRisu.svelte @@ -5,7 +5,7 @@ import { DataBase, setPreset } from "src/ts/storage/database"; import Chat from "../ChatScreens/Chat.svelte"; import { prebuiltPresets } from "src/ts/process/templates/templates"; - import { updateTextTheme } from "src/ts/gui/colorscheme"; + import { updateTextThemeAndCSS } from "src/ts/gui/colorscheme"; let step = 0 let provider = '' @@ -65,7 +65,7 @@ setTimeout(() => { $DataBase = setPreset($DataBase, prebuiltPresets.OAI2) $DataBase.textTheme = 'highcontrast' - updateTextTheme() + updateTextThemeAndCSS() if(provider === 'openrouter'){ $DataBase.aiModel = 'openrouter' $DataBase.subModel = 'openrouter' diff --git a/src/lib/Setting/Pages/DisplaySettings.svelte b/src/lib/Setting/Pages/DisplaySettings.svelte index dac10c73..a425b60e 100644 --- a/src/lib/Setting/Pages/DisplaySettings.svelte +++ b/src/lib/Setting/Pages/DisplaySettings.svelte @@ -8,11 +8,12 @@ import SelectInput from "src/lib/UI/GUI/SelectInput.svelte"; import OptionInput from "src/lib/UI/GUI/OptionInput.svelte"; import { updateAnimationSpeed } from "src/ts/gui/animation"; - import { changeColorScheme, colorSchemeList, exportColorScheme, importColorScheme, updateColorScheme, updateTextTheme } from "src/ts/gui/colorscheme"; + import { changeColorScheme, colorSchemeList, exportColorScheme, importColorScheme, updateColorScheme, updateTextThemeAndCSS } from "src/ts/gui/colorscheme"; import { DownloadIcon, FolderUpIcon } from "lucide-svelte"; import { guiSizeText, updateGuisize } from "src/ts/gui/guisize"; import TextInput from "src/lib/UI/GUI/TextInput.svelte"; import ColorInput from "src/lib/UI/GUI/ColorInput.svelte"; + import TextAreaInput from "src/lib/UI/GUI/TextAreaInput.svelte"; const onSchemeInputChange = (e:Event) => { changeColorScheme((e.target as HTMLInputElement).value) @@ -24,7 +25,7 @@

{language.display}

{#if submenu !== -1} -
+
{/if} + {language.customCSS} + { + updateTextThemeAndCSS() + }} /> + {/if} \ No newline at end of file diff --git a/src/lib/Setting/Settings.svelte b/src/lib/Setting/Settings.svelte index a90e9f2f..a847a0cd 100644 --- a/src/lib/Setting/Settings.svelte +++ b/src/lib/Setting/Settings.svelte @@ -27,10 +27,10 @@ } -
-
+
+
{#if window.innerWidth >= 700 || $SettingsMenuIndex === -1} -