Commit 30ae8abd by 姜雷

Merge branch 'develop' into test

parents d3254a2e a4f7f715
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
body, body,
#app { #app {
width: 100%; width: 100%;
height: 100%; /* height: 100%;
overflow: hidden; overflow: hidden; */
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
padding: 6.66667vw; padding: 6.66667vw;
} }
.Content { .Content {
height: 100%; /* height: 100%; */
padding: 4.8vw 3.2vw; padding: 4.8vw 3.2vw;
box-sizing: border-box; box-sizing: border-box;
overflow-y: scroll; /* overflow-y: scroll;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch; */
} }
.Content .content-title { .Content .content-title {
font-size: 4.53333vw; font-size: 4.53333vw;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment