From 4a80ef5544ff210d9e0aaa4cb1eaf3dba8c39645 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 11:14:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/App.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6cd8911..6b056a7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,9 +13,9 @@
 }
 </script>
 
-<style>
+<style lang="less">
 html, body, #app{
-  color: #2c3e50;
+  color: @color;
   height: 100vh;
   width: 100vw;
   margin: 0;
@@ -23,10 +23,11 @@
   overflow: hidden;
 }
 body .el-scrollbar__wrap {
-  overflow-x: hidden;
+  // overflow-x: hidden;
 }
 body{
   -ms-overflow-style: none;
+  font-size: 12px;
 }
 
 </style>

--
Gitblit v1.8.0