diff --git a/css/NotoSans/NotoSans-Black.woff b/css/NotoSans/NotoSans-Black.woff new file mode 100644 index 0000000000..0280e0f137 Binary files /dev/null and b/css/NotoSans/NotoSans-Black.woff differ diff --git a/css/NotoSans/NotoSans-Black.woff2 b/css/NotoSans/NotoSans-Black.woff2 new file mode 100644 index 0000000000..1d51183992 Binary files /dev/null and b/css/NotoSans/NotoSans-Black.woff2 differ diff --git a/css/NotoSans/NotoSans-BlackItalic.woff b/css/NotoSans/NotoSans-BlackItalic.woff new file mode 100644 index 0000000000..5cd4424a6f Binary files /dev/null and b/css/NotoSans/NotoSans-BlackItalic.woff differ diff --git a/css/NotoSans/NotoSans-BlackItalic.woff2 b/css/NotoSans/NotoSans-BlackItalic.woff2 new file mode 100644 index 0000000000..f0baeca274 Binary files /dev/null and b/css/NotoSans/NotoSans-BlackItalic.woff2 differ diff --git a/css/NotoSans/NotoSans-Bold.woff b/css/NotoSans/NotoSans-Bold.woff new file mode 100644 index 0000000000..750b737544 Binary files /dev/null and b/css/NotoSans/NotoSans-Bold.woff differ diff --git a/css/NotoSans/NotoSans-Bold.woff2 b/css/NotoSans/NotoSans-Bold.woff2 new file mode 100644 index 0000000000..af6c17d0c5 Binary files /dev/null and b/css/NotoSans/NotoSans-Bold.woff2 differ diff --git a/css/NotoSans/NotoSans-BoldItalic.woff b/css/NotoSans/NotoSans-BoldItalic.woff new file mode 100644 index 0000000000..d484cf22c0 Binary files /dev/null and b/css/NotoSans/NotoSans-BoldItalic.woff differ diff --git a/css/NotoSans/NotoSans-BoldItalic.woff2 b/css/NotoSans/NotoSans-BoldItalic.woff2 new file mode 100644 index 0000000000..210c3a1de0 Binary files /dev/null and b/css/NotoSans/NotoSans-BoldItalic.woff2 differ diff --git a/css/NotoSans/NotoSans-ExtraBold.woff b/css/NotoSans/NotoSans-ExtraBold.woff new file mode 100644 index 0000000000..1a1e41d39b Binary files /dev/null and b/css/NotoSans/NotoSans-ExtraBold.woff differ diff --git a/css/NotoSans/NotoSans-ExtraBold.woff2 b/css/NotoSans/NotoSans-ExtraBold.woff2 new file mode 100644 index 0000000000..e2bd3232d1 Binary files /dev/null and b/css/NotoSans/NotoSans-ExtraBold.woff2 differ diff --git a/css/NotoSans/NotoSans-ExtraBoldItalic.woff b/css/NotoSans/NotoSans-ExtraBoldItalic.woff new file mode 100644 index 0000000000..95d68a956a Binary files /dev/null and b/css/NotoSans/NotoSans-ExtraBoldItalic.woff differ diff --git a/css/NotoSans/NotoSans-ExtraBoldItalic.woff2 b/css/NotoSans/NotoSans-ExtraBoldItalic.woff2 new file mode 100644 index 0000000000..65892aeb95 Binary files /dev/null and b/css/NotoSans/NotoSans-ExtraBoldItalic.woff2 differ diff --git a/css/NotoSans/NotoSans-ExtraLight.woff b/css/NotoSans/NotoSans-ExtraLight.woff new file mode 100644 index 0000000000..4b8a5596d3 Binary files /dev/null and b/css/NotoSans/NotoSans-ExtraLight.woff differ diff --git a/css/NotoSans/NotoSans-ExtraLight.woff2 b/css/NotoSans/NotoSans-ExtraLight.woff2 new file mode 100644 index 0000000000..e92cf55d23 Binary files /dev/null and b/css/NotoSans/NotoSans-ExtraLight.woff2 differ diff --git a/css/NotoSans/NotoSans-ExtraLightItalic.woff b/css/NotoSans/NotoSans-ExtraLightItalic.woff new file mode 100644 index 0000000000..f0b0a671ec Binary files /dev/null and b/css/NotoSans/NotoSans-ExtraLightItalic.woff differ diff --git a/css/NotoSans/NotoSans-ExtraLightItalic.woff2 b/css/NotoSans/NotoSans-ExtraLightItalic.woff2 new file mode 100644 index 0000000000..d63c4f7eed Binary files /dev/null and b/css/NotoSans/NotoSans-ExtraLightItalic.woff2 differ diff --git a/css/NotoSans/NotoSans-Italic.woff b/css/NotoSans/NotoSans-Italic.woff new file mode 100644 index 0000000000..bc89297466 Binary files /dev/null and b/css/NotoSans/NotoSans-Italic.woff differ diff --git a/css/NotoSans/NotoSans-Italic.woff2 b/css/NotoSans/NotoSans-Italic.woff2 new file mode 100644 index 0000000000..a6bd8a3709 Binary files /dev/null and b/css/NotoSans/NotoSans-Italic.woff2 differ diff --git a/css/NotoSans/NotoSans-Light.woff b/css/NotoSans/NotoSans-Light.woff new file mode 100644 index 0000000000..b89c99716f Binary files /dev/null and b/css/NotoSans/NotoSans-Light.woff differ diff --git a/css/NotoSans/NotoSans-Light.woff2 b/css/NotoSans/NotoSans-Light.woff2 new file mode 100644 index 0000000000..962c6d7652 Binary files /dev/null and b/css/NotoSans/NotoSans-Light.woff2 differ diff --git a/css/NotoSans/NotoSans-LightItalic.woff b/css/NotoSans/NotoSans-LightItalic.woff new file mode 100644 index 0000000000..741ab91d57 Binary files /dev/null and b/css/NotoSans/NotoSans-LightItalic.woff differ diff --git a/css/NotoSans/NotoSans-LightItalic.woff2 b/css/NotoSans/NotoSans-LightItalic.woff2 new file mode 100644 index 0000000000..9153283066 Binary files /dev/null and b/css/NotoSans/NotoSans-LightItalic.woff2 differ diff --git a/css/NotoSans/NotoSans-Medium.woff b/css/NotoSans/NotoSans-Medium.woff new file mode 100644 index 0000000000..d8dfb11002 Binary files /dev/null and b/css/NotoSans/NotoSans-Medium.woff differ diff --git a/css/NotoSans/NotoSans-Medium.woff2 b/css/NotoSans/NotoSans-Medium.woff2 new file mode 100644 index 0000000000..deff785776 Binary files /dev/null and b/css/NotoSans/NotoSans-Medium.woff2 differ diff --git a/css/NotoSans/NotoSans-MediumItalic.woff b/css/NotoSans/NotoSans-MediumItalic.woff new file mode 100644 index 0000000000..d7ca037e32 Binary files /dev/null and b/css/NotoSans/NotoSans-MediumItalic.woff differ diff --git a/css/NotoSans/NotoSans-MediumItalic.woff2 b/css/NotoSans/NotoSans-MediumItalic.woff2 new file mode 100644 index 0000000000..d87d4b6378 Binary files /dev/null and b/css/NotoSans/NotoSans-MediumItalic.woff2 differ diff --git a/css/NotoSans/NotoSans-Regular.woff b/css/NotoSans/NotoSans-Regular.woff new file mode 100644 index 0000000000..64d9e17c6e Binary files /dev/null and b/css/NotoSans/NotoSans-Regular.woff differ diff --git a/css/NotoSans/NotoSans-Regular.woff2 b/css/NotoSans/NotoSans-Regular.woff2 new file mode 100644 index 0000000000..172de3ca2a Binary files /dev/null and b/css/NotoSans/NotoSans-Regular.woff2 differ diff --git a/css/NotoSans/NotoSans-SemiBold.woff b/css/NotoSans/NotoSans-SemiBold.woff new file mode 100644 index 0000000000..abd6f54295 Binary files /dev/null and b/css/NotoSans/NotoSans-SemiBold.woff differ diff --git a/css/NotoSans/NotoSans-SemiBold.woff2 b/css/NotoSans/NotoSans-SemiBold.woff2 new file mode 100644 index 0000000000..1c38d6796c Binary files /dev/null and b/css/NotoSans/NotoSans-SemiBold.woff2 differ diff --git a/css/NotoSans/NotoSans-SemiBoldItalic.woff b/css/NotoSans/NotoSans-SemiBoldItalic.woff new file mode 100644 index 0000000000..32dd0195e4 Binary files /dev/null and b/css/NotoSans/NotoSans-SemiBoldItalic.woff differ diff --git a/css/NotoSans/NotoSans-SemiBoldItalic.woff2 b/css/NotoSans/NotoSans-SemiBoldItalic.woff2 new file mode 100644 index 0000000000..853adbfc54 Binary files /dev/null and b/css/NotoSans/NotoSans-SemiBoldItalic.woff2 differ diff --git a/css/NotoSans/NotoSans-Thin.woff b/css/NotoSans/NotoSans-Thin.woff new file mode 100644 index 0000000000..edb17d3ede Binary files /dev/null and b/css/NotoSans/NotoSans-Thin.woff differ diff --git a/css/NotoSans/NotoSans-Thin.woff2 b/css/NotoSans/NotoSans-Thin.woff2 new file mode 100644 index 0000000000..ca9fd928ca Binary files /dev/null and b/css/NotoSans/NotoSans-Thin.woff2 differ diff --git a/css/NotoSans/NotoSans-ThinItalic.woff b/css/NotoSans/NotoSans-ThinItalic.woff new file mode 100644 index 0000000000..43d33e8e9d Binary files /dev/null and b/css/NotoSans/NotoSans-ThinItalic.woff differ diff --git a/css/NotoSans/NotoSans-ThinItalic.woff2 b/css/NotoSans/NotoSans-ThinItalic.woff2 new file mode 100644 index 0000000000..73d94abc03 Binary files /dev/null and b/css/NotoSans/NotoSans-ThinItalic.woff2 differ diff --git a/css/NotoSans/stylesheet.css b/css/NotoSans/stylesheet.css new file mode 100644 index 0000000000..467973b8ee --- /dev/null +++ b/css/NotoSans/stylesheet.css @@ -0,0 +1,166 @@ +/* +Copied from https://github.com/SillyTavern/SillyTavern/tree/6c8bd06308c69d51e2eb174541792a870a83d2d6/public/webfonts/NotoSans +*/ + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-Black.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-Black.woff') format('woff'); + font-weight: 900; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-ExtraBoldItalic.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-ExtraBoldItalic.woff') format('woff'); + font-weight: bold; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-BlackItalic.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-BlackItalic.woff') format('woff'); + font-weight: 900; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-ExtraBold.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-ExtraBold.woff') format('woff'); + font-weight: bold; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-ThinItalic.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-ThinItalic.woff') format('woff'); + font-weight: 100; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-BoldItalic.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-BoldItalic.woff') format('woff'); + font-weight: bold; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-Bold.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-Bold.woff') format('woff'); + font-weight: bold; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-LightItalic.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-LightItalic.woff') format('woff'); + font-weight: 300; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-Italic.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-Italic.woff') format('woff'); + font-weight: normal; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-ExtraLightItalic.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-ExtraLightItalic.woff') format('woff'); + font-weight: 200; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-Light.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-Light.woff') format('woff'); + font-weight: 300; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-ExtraLight.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-ExtraLight.woff') format('woff'); + font-weight: 200; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-Medium.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-Medium.woff') format('woff'); + font-weight: 500; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-Regular.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-Regular.woff') format('woff'); + font-weight: normal; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-MediumItalic.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-MediumItalic.woff') format('woff'); + font-weight: 500; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-SemiBoldItalic.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-SemiBoldItalic.woff') format('woff'); + font-weight: 600; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-SemiBold.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-SemiBold.woff') format('woff'); + font-weight: 600; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('file/css/NotoSans/NotoSans-Thin.woff2') format('woff2'), + url('file/css/NotoSans/NotoSans-Thin.woff') format('woff'); + font-weight: 100; + font-style: normal; + font-display: swap; +} + diff --git a/css/chat_style-TheEncrypted777.css b/css/chat_style-TheEncrypted777.css index d92e982d8f..bdfd2eaa3c 100644 --- a/css/chat_style-TheEncrypted777.css +++ b/css/chat_style-TheEncrypted777.css @@ -5,8 +5,7 @@ grid-template-columns: 60px minmax(0, 1fr); padding-bottom: 28px; font-size: 18px; - /*Change 'Quicksand' to a font you like or leave it*/ - font-family: Quicksand, Arial, sans-serif; + font-family: 'Noto Sans', Arial, sans-serif; line-height: 1.428571429; } @@ -105,7 +104,7 @@ grid-template-columns: 60px minmax(0, 1fr); padding-bottom: 25px; font-size: 15px; - font-family: Helvetica, Arial, sans-serif; + font-family: 'Noto Sans', Helvetica, Arial, sans-serif; line-height: 1.428571429; } diff --git a/css/chat_style-cai-chat.css b/css/chat_style-cai-chat.css index 50c6a476b1..a1f73b00d7 100644 --- a/css/chat_style-cai-chat.css +++ b/css/chat_style-cai-chat.css @@ -3,8 +3,8 @@ grid-template-columns: 60px minmax(0, 1fr); padding-bottom: 25px; font-size: 15px; - font-family: Helvetica, Arial, sans-serif; - line-height: 1.3333; + font-family: 'Noto Sans', Helvetica, Arial, sans-serif; + line-height: 23px !important; } .circle-you { @@ -46,7 +46,7 @@ .message-body p { margin-bottom: 0 !important; font-size: 15px !important; - line-height: 1.3333 !important; + line-height: 23px !important; } .dark .message-body p em { diff --git a/css/chat_style-messenger.css b/css/chat_style-messenger.css index 0e5528d86a..fb3f65a458 100644 --- a/css/chat_style-messenger.css +++ b/css/chat_style-messenger.css @@ -1,7 +1,7 @@ .message { padding-bottom: 25px; font-size: 15px; - font-family: Helvetica, Arial, sans-serif; + font-family: 'Noto Sans', Helvetica, Arial, sans-serif; line-height: 1.428571429; } diff --git a/css/chat_style-wpp.css b/css/chat_style-wpp.css index 14b408784d..da9f172f43 100644 --- a/css/chat_style-wpp.css +++ b/css/chat_style-wpp.css @@ -1,7 +1,7 @@ .message { padding-bottom: 25px; font-size: 15px; - font-family: Helvetica, Arial, sans-serif; + font-family: 'Noto Sans', Helvetica, Arial, sans-serif; line-height: 1.428571429; } diff --git a/css/html_instruct_style.css b/css/html_instruct_style.css index c8b697dfcd..fd215c03cc 100644 --- a/css/html_instruct_style.css +++ b/css/html_instruct_style.css @@ -3,7 +3,7 @@ grid-template-columns: 60px 1fr; padding-bottom: 25px; font-size: 15px; - font-family: Helvetica, Arial, sans-serif; + font-family: 'Noto Sans', Helvetica, Arial, sans-serif; line-height: 1.428571429; } diff --git a/css/main.css b/css/main.css index b02ca95035..c14be18193 100644 --- a/css/main.css +++ b/css/main.css @@ -403,7 +403,7 @@ div.svelte-362y77>*, div.svelte-362y77>.form>* { #show-controls { position: absolute; background-color: transparent; - left: calc(100% - 175px); + left: calc(100% - 178px); border: 0px; z-index: 1000; } diff --git a/modules/ui.py b/modules/ui.py index 141ab62a3c..2f8664f216 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -8,8 +8,10 @@ from modules import shared -with open(Path(__file__).resolve().parent / '../css/main.css', 'r') as f: +with open(Path(__file__).resolve().parent / '../css/NotoSans/stylesheet.css', 'r') as f: css = f.read() +with open(Path(__file__).resolve().parent / '../css/main.css', 'r') as f: + css += f.read() with open(Path(__file__).resolve().parent / '../js/main.js', 'r') as f: js = f.read() with open(Path(__file__).resolve().parent / '../js/save_files.js', 'r') as f: @@ -24,7 +26,7 @@ save_symbol = '💾' theme = gr.themes.Default( - font=['Helvetica', 'ui-sans-serif', 'system-ui', 'sans-serif'], + font=['Noto Sans', 'Helvetica', 'ui-sans-serif', 'system-ui', 'sans-serif'], font_mono=['IBM Plex Mono', 'ui-monospace', 'Consolas', 'monospace'], ).set( border_color_primary='#c5c5d2',