Merge branch 'develop' into test

30ae8abd · 姜雷 · d3254a2e · a4f7f715 · 30ae8abd
Commit 30ae8abd authored Apr 04, 2019 by 姜雷
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

index.html index.html +5 -5

No files found.
--- a/index.html
+++ b/index.html
@@ -14,8 +14,8 @@
      body,
      #app {
        width: 100%;
-        height: 100%;
-        overflow: hidden;
+        /* height: 100%;
+        overflow: hidden; */
        margin: 0;
        padding: 0;
      }
@@ -23,11 +23,11 @@
        padding: 6.66667vw;
      }
      .Content {
-        height: 100%;
+        /* height: 100%; */
        padding: 4.8vw 3.2vw;
        box-sizing: border-box;
-        overflow-y: scroll;
-        -webkit-overflow-scrolling: touch;
+        /* overflow-y: scroll;
+        -webkit-overflow-scrolling: touch; */
      }
      .Content .content-title {
        font-size: 4.53333vw;