diff --git a/src/renderer/src/assets/fonts/Poppins/Poppins-Black.ttf b/src/renderer/src/assets/fonts/Poppins/Poppins-Black.ttf new file mode 100644 index 000000000..71c0f995e Binary files /dev/null and b/src/renderer/src/assets/fonts/Poppins/Poppins-Black.ttf differ diff --git a/src/renderer/src/assets/fonts/Poppins/Poppins-Bold.ttf b/src/renderer/src/assets/fonts/Poppins/Poppins-Bold.ttf new file mode 100644 index 000000000..00559eeb2 Binary files /dev/null and b/src/renderer/src/assets/fonts/Poppins/Poppins-Bold.ttf differ diff --git a/src/renderer/src/assets/fonts/Poppins/Poppins-ExtraBold.ttf b/src/renderer/src/assets/fonts/Poppins/Poppins-ExtraBold.ttf new file mode 100644 index 000000000..df7093608 Binary files /dev/null and b/src/renderer/src/assets/fonts/Poppins/Poppins-ExtraBold.ttf differ diff --git a/src/renderer/src/assets/fonts/Poppins/Poppins-ExtraLight.ttf b/src/renderer/src/assets/fonts/Poppins/Poppins-ExtraLight.ttf new file mode 100644 index 000000000..e76ec69a6 Binary files /dev/null and b/src/renderer/src/assets/fonts/Poppins/Poppins-ExtraLight.ttf differ diff --git a/src/renderer/src/assets/fonts/Poppins/Poppins-Light.ttf b/src/renderer/src/assets/fonts/Poppins/Poppins-Light.ttf new file mode 100644 index 000000000..bc36bcc24 Binary files /dev/null and b/src/renderer/src/assets/fonts/Poppins/Poppins-Light.ttf differ diff --git a/src/renderer/src/assets/fonts/Poppins/Poppins-Medium.ttf b/src/renderer/src/assets/fonts/Poppins/Poppins-Medium.ttf new file mode 100644 index 000000000..6bcdcc27f Binary files /dev/null and b/src/renderer/src/assets/fonts/Poppins/Poppins-Medium.ttf differ diff --git a/src/renderer/src/assets/fonts/Poppins/Poppins-Regular.ttf b/src/renderer/src/assets/fonts/Poppins/Poppins-Regular.ttf new file mode 100644 index 000000000..9f0c71b70 Binary files /dev/null and b/src/renderer/src/assets/fonts/Poppins/Poppins-Regular.ttf differ diff --git a/src/renderer/src/assets/fonts/Poppins/Poppins-SemiBold.ttf b/src/renderer/src/assets/fonts/Poppins/Poppins-SemiBold.ttf new file mode 100644 index 000000000..74c726e32 Binary files /dev/null and b/src/renderer/src/assets/fonts/Poppins/Poppins-SemiBold.ttf differ diff --git a/src/renderer/src/assets/fonts/Poppins/Poppins-Thin.ttf b/src/renderer/src/assets/fonts/Poppins/Poppins-Thin.ttf new file mode 100644 index 000000000..03e736613 Binary files /dev/null and b/src/renderer/src/assets/fonts/Poppins/Poppins-Thin.ttf differ diff --git a/src/renderer/src/assets/fonts/Poppins/Poppins.css b/src/renderer/src/assets/fonts/Poppins/Poppins.css new file mode 100644 index 000000000..bc72ccf61 --- /dev/null +++ b/src/renderer/src/assets/fonts/Poppins/Poppins.css @@ -0,0 +1,47 @@ +@font-face { + font-family: 'Poppins'; + src: url(Poppins-Thin.ttf) format('truetype'); + font-weight: 100; +} + +@font-face { + font-family: 'Poppins'; + src: url(Poppins-ExtraLight.ttf) format('truetype'); + font-weight: 200; +} + +@font-face { + font-family: 'Poppins'; + src: url(Poppins-Light.ttf) format('truetype'); + font-weight: 300; +} + +@font-face { + font-family: 'Poppins'; + src: url(Poppins-Regular.ttf) format('truetype'); + font-weight: 400; +} + +@font-face { + font-family: 'Poppins'; + src: url(Poppins-Medium.ttf) format('truetype'); + font-weight: 500; +} + +@font-face { + font-family: 'Poppins'; + src: url(Poppins-SemiBold.ttf) format('truetype'); + font-weight: 600; +} + +@font-face { + font-family: 'Poppins'; + src: url(Poppins-Bold.ttf) format('truetype'); + font-weight: 700; +} + +@font-face { + font-family: 'Poppins'; + src: url(Poppins-ExtraBold.ttf) format('truetype'); + font-weight: 800; +} diff --git a/src/renderer/src/assets/styles/index.scss b/src/renderer/src/assets/styles/index.scss index 26dd67a2e..078134a7f 100644 --- a/src/renderer/src/assets/styles/index.scss +++ b/src/renderer/src/assets/styles/index.scss @@ -1,7 +1,7 @@ -@import '../fonts/icon-fonts/iconfont.css'; @import './markdown.scss'; @import './scrollbar.scss'; -@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); +@import '../fonts/icon-fonts/iconfont.css'; +@import '../fonts/Poppins/Poppins.css'; :root { --color-white: #ffffff; @@ -46,7 +46,7 @@ --topic-list-width: 260px; --settings-width: var(--assistants-width); --status-bar-height: 40px; - --input-bar-height: 130px; + --input-bar-height: 115px; } body[theme-mode='light'] { @@ -83,8 +83,8 @@ body[theme-mode='light'] { --color-scrollbar-thumb: rgba(0, 0, 0, 0.15); --color-scrollbar-thumb-hover: rgba(0, 0, 0, 0.3); - --navbar-background: rgba(255, 255, 255, 0.6); - --sidebar-background: rgba(255, 255, 255, 0.6); + --navbar-background: rgba(255, 255, 255, 0.75); + --sidebar-background: rgba(255, 255, 255, 0.75); } *, diff --git a/src/renderer/src/pages/home/components/Inputbar.tsx b/src/renderer/src/pages/home/components/Inputbar.tsx index f12ce6df2..a64ba5281 100644 --- a/src/renderer/src/pages/home/components/Inputbar.tsx +++ b/src/renderer/src/pages/home/components/Inputbar.tsx @@ -141,7 +141,7 @@ const Inputbar: FC = ({ assistant, setActiveTopic }) => { return ( - + setExpend(!expended)}> @@ -171,6 +171,17 @@ const Inputbar: FC = ({ assistant, setActiveTopic }) => { + + setExpend(!expended)}> + {expended ? : } + + + {showInputEstimatedTokens && ( + + {assistant?.settings?.contextCount ?? DEFAULT_CONEXTCOUNT} | T↑ + {`${inputTokenCount}/${estimateTokenCount}`} + + )} {generating && ( @@ -180,11 +191,7 @@ const Inputbar: FC = ({ assistant, setActiveTopic }) => { )} - - setExpend(!expended)}> - {expended ? : } - - +