7x31
/
ChatGPT-Next-Web
mirror of https://github.com/Yidadaa/ChatGPT-Next-Web.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

This commit is contained in:
dakai 2023-04-02 23:15:40 +08:00
parent 4dd2ef71fa
commit 56caf3a218
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/styles/globals.scss
View File

@ -51,15 +51,10 @@
--window-width: 90vw; --window-width: 90vw;
--window-height: 90vh; --window-height: 90vh;
--sidebar-width: 300px; --sidebar-width: 300px;
<<<<<<< HEAD
--sidebar-collapse-width: 75px; --sidebar-collapse-width: 75px;
--window-content-width: calc(100% - var(--sidebar-width)); --window-content-width: calc(100% - var(--sidebar-width));
--window-content-width-collapse: calc(100% - var(--sidebar-collapse-width)); --window-content-width-collapse: calc(100% - var(--sidebar-collapse-width));
--message-max-width: 90%; --message-max-width: 90%;
=======
--window-content-width: calc(100% - var(--sidebar-width));
--message-max-width: 80%;
>>>>>>> a6c598c0172ee0121b92e7a114c7145846614006
--full-height: 100%; --full-height: 100%;
} }