Home Explore Help
Register Sign In
zhengxiaoyu
/
datiGame
Watch 2
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://120.78.169.79:3000/zhengxiaoyu/datiGame

郑晓宇 6 years ago
parent
0b297b0a37 3c29d05c29
commit
c45f80d03b
2 changed files with 7 additions and 7 deletions
Split View Show Diff Stats
  1. 5 5
      public/h5/datigame/css/main.css
  2. 2 2
      public/h5/datigame/index.html

+ 5 - 5
public/h5/datigame/css/main.css
View File 

@@ -108,8 +108,8 @@ body{
 
 .cov1 .userface{width: 2.2rem;height: 2.2rem;margin: 0 auto;}
 
 .gstart .cov3{}
 
 .cov3{left: 50%;top: 9rem;width: 2rem;height: 1rem;line-height: 1rem;margin-left: -1rem;text-align: center;font-size: .5rem;color: #FFF;font-weight: bold;border-radius: .2rem;}
 
-.cov4{right: 50%;top: 8.5rem;width: 2rem;margin-right: -1rem;opacity: 0;}
 
-.ready .cov4{opacity:1;top:3rem;right: 1.5rem;}
 
+.cov4{right: 50%;top: 8.5rem;width: 2rem;margin-right: -1rem;display: none; }
 
+.ready .cov4{opacity:1;top:3rem;right: 1.5rem; display: block;}
 
 .ready .cov4 .userface{
 
     width: 1.5rem;
 
     height: 1.5rem;
 
@@ -132,12 +132,12 @@ body{
 
 .doing .cov4 .num{
 
     left: .8rem;
 
 }
 
-.doing .cov4,.end .cov4{right: 50%;top: 10rem;width: 2rem;margin-left: -1rem;}
 
-.doing .cov4{right: -.4rem;top: 2rem;width: 4rem;border-radius: 1rem;margin-right: 0rem;height: 1rem;background: url(../img/user1.png);background-size: 4.3rem;z-index: 1;}
 
+.doing .cov4,.end .cov4{right: 50%;top: 10rem;width: 2rem;margin-left: -1rem;display: block;}
 
+.doing .cov4{right: -.4rem;top: 2rem;width: 4rem;border-radius: 1rem;margin-right: 0rem;height: 1rem;background: url(../img/user1.png);background-size: 4.3rem;z-index: 19;opacity: 1;}
 
 .doing .cov1  .userface{width: 1.0rem;height: 1.0rem;left: .8rem;background: url(../img/user0-face.png);background-size: 100%;}
 
  
 .doing .cov2 , .doing .loading{opacity: 0;position: absolute;left: 50%;margin-left: -2.3rem;}
 
-.doing .cov3{top: 0rem;z-index: 9;}
 
+.doing .cov3{top: 0rem;z-index: 99;position: fixed;}
 
 .doing  .userface{position: absolute;top: -.5rem;}
 
 .cov .name{
 
     color: #fff;

+ 2 - 2
public/h5/datigame/index.html
View File 

@@ -19,11 +19,11 @@
 
 </script>
 
 <link href="./css/wapzt_base_rem.1.0.css" rel="stylesheet" type="text/css" />
 
 <link rel="stylesheet" href="./css/animate.min.css">
 
-<link rel="stylesheet" href="./css/main.css?v2">
 
+<link rel="stylesheet" href="./css/main.css?v101">
 
 </head>
 
 <body>
 
 	<div class="g-doc">
 
-    <canvas id="canvas" style="position: fixed;left: 0;top: 0; width: 100%;height: 100%;"></canvas>
 
+    <canvas id="canvas" style="position: absolute;left: 0;top: 0;z-index: 0; "></canvas>
 
 
   <div class="popbg"></div>
 
     <div class="g-inner welcome">