From 20614ed4f04e41e1aea3cc2c8b69b752d00713bb Mon Sep 17 00:00:00 2001 From: khk Date: Tue, 3 Dec 2019 09:32:54 +0900 Subject: [PATCH] Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger # Conflicts: # projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.html # projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html --- .../ucap-webmessenger-app/src/assets/scss/global/_default.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss index eb52afce..0dc5dba1 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -8,6 +8,9 @@ body { position: relative; width: 100%; height: 100%; + min-width: 1160px; + min-height: 700px; + overflow: auto; padding: 0; margin: 0; color: #333;