resolve conflict

2023-04-02 23:15:40 +08:00 · 2023-04-02 23:15:40 +08:00 · 56caf3a218
parent 4dd2ef71fa
commit 56caf3a218
1 changed files with 0 additions and 5 deletions
--- a/app/styles/globals.scss
+++ b/app/styles/globals.scss
@ -51,15 +51,10 @@
  --window-width: 90vw;
  --window-height: 90vh;
  --sidebar-width: 300px;
-<<<<<<< HEAD
  --sidebar-collapse-width: 75px;
  --window-content-width: calc(100% - var(--sidebar-width));
  --window-content-width-collapse: calc(100% - var(--sidebar-collapse-width));
  --message-max-width: 90%;
-=======
-  --window-content-width: calc(100% - var(--sidebar-width));
-  --message-max-width: 80%;
->>>>>>> a6c598c0172ee0121b92e7a114c7145846614006
  --full-height: 100%;
 }