resolve conflict, 10% larger msg box

2023-04-01 10:59:27 +08:00 · 2023-04-01 10:59:27 +08:00 · 70602b5b76
parent add9f9d9cb
commit 70602b5b76
2 changed files with 5201 additions and 4 deletions
--- a/app/styles/globals.scss
+++ b/app/styles/globals.scss
@ -53,13 +53,9 @@
  --sidebar-width: 380px;
  --sidebar-collapse-width: 8vh;
  --window-content-width: calc(100% - var(--sidebar-width));
-<<<<<<< HEAD
  --window-content-width-collapse: calc(100% - var(--sidebar-collapse-width));
  --message-max-width: 90%;
-=======
-  --message-max-width: 80%;
  --full-height: 100%;
->>>>>>> upstream/main
 }

@media only screen and (max-width: 600px) {
--- a/yarn.lock
+++ b/yarn.lock