From 10b5efefb0f22715ecf871e79a67a165ab8610a7 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期六, 13 三月 2021 16:43:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/App.vue |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 11b7cc7..24ecc4b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,13 +13,22 @@
 }
 </script>
 
-<style>
+<style lang="less">
+@import '@assets/css/map/_map-variable';
 html, body, #app{
-  color: #2c3e50;
+  color: @color;
   height: 100vh;
   width: 100vw;
   margin: 0;
   padding: 0;
   overflow: hidden;
 }
+body .el-scrollbar__wrap {
+  overflow-x: hidden;
+}
+body{
+  -ms-overflow-style: none;
+  font-size: 12px;
+}
+
 </style>

--
Gitblit v1.8.0