Merge branch 'dev' of https://github.com/Tencent/vConsole into dev

AricBa · Jan 16, 2019 · 9e4cd67 · 9e4cd67
2 parents 3ed770b + 88cd70e
commit 9e4cd67
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/example/demo1.html b/example/demo1.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, viewport-fit=cover">
   <title>vConsole/Demo1</title>
   <link href="./lib/weui.min.css" rel="stylesheet"/>
   <link href="./lib/demo.css" rel="stylesheet"/>
@@ -12,7 +12,7 @@
 
   <!-- 引入vConsole的JS库 -->
   <script src="../dist/vconsole.min.js"></script>
-  
+
 </head>
 <body ontouchstart>
   <div class="page">

diff --git a/src/core/core.less b/src/core/core.less
@@ -107,6 +107,8 @@
     right: 0;
     bottom: 40em / @font;
     -webkit-overflow-scrolling: touch;
+    margin-bottom: constant(safe-area-inset-bottom);
+    margin-bottom: env(safe-area-inset-bottom);
   }
   .vc-content.vc-has-topbar {
     top: 71em / @font;
@@ -514,6 +516,12 @@
       border: none;
     }
   }
+  @supports (bottom: constant(safe-area-inset-bottom)) or (bottom: env(safe-area-inset-bottom)) {
+    .vc-toolbar {
+      bottom: constant(safe-area-inset-bottom);
+      bottom: env(safe-area-inset-bottom);
+    }
+  }
 
 }