index.html

JontyLu · Mar 28, 2017 · 1b6797b · 1b6797b
1 parent 48a121b
commit 1b6797b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/css/aboutUs.css b/css/aboutUs.css
@@ -11,12 +11,19 @@ html{
 body{
     display: block;
 }
+.mask{
+
+    background-color: #fff;
+    display: inline-block;
+    box-sizing: border-box;
+}
 img{
     max-width: 100% ;
 }
 .nav{
     height: 30%;
-    padding: 2rem;
+    padding: 2rem 1rem 2rem 1rem;
+
     z-index: 10;
 }
 
@@ -90,7 +97,7 @@ img{
 
 .container{
     height: 100%;
-    margin: 3rem;
+    margin: 1rem;
     padding-top: 1rem;
     border: 0.05rem solid #ffffff;
 }
@@ -191,13 +198,14 @@ img{
         font-size: 0.5rem;
 
     }
+    .logo,.logo-divider,.logoname{
+        font-size: 0.5rem;
+    }
 }
 
 @media (max-width: 415px){
     /*<=768的设备*/
-    .logo,.logo-divider,.logoname{
-        font-size: 0.5rem;
-    }
+
     .eachResume{
         padding: 0.5rem;
     }
@@ -212,7 +220,7 @@ img{
         font-size: 1rem;
     }
     .navOpenMenu a{
-        margin-top: 1pxrem;
+        margin-top: 1rem;
         font-size: 0.5rem;
 
     }

diff --git a/html/aboutUsPage.html b/html/aboutUsPage.html
@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="../css/aboutUs.css"/>
 </head>
 <body>
+<div id="masking"  ></div>
 <div class="nav">
     <a class="brandContainer" href="index.html">
         <img class="logo"  src="../image/airplane.svg" >

diff --git a/js/navOpenMenu.js b/js/navOpenMenu.js
@@ -3,7 +3,7 @@
  */
 window.onload=function(){
     var navOpenMenu = document.getElementsByClassName("navOpenMenu")[0];
-    var noNavOpenMenu = document.getElementsByClassName("navOpenMenu")[0];
+    var noNavOpenMenu = document.getElementsByClassName("container")[0];
 
     var odiv = document.getElementsByClassName("smallMenu")[0];
 
@@ -12,10 +12,14 @@ window.onload=function(){
 
         startmove(0,10);//第一个参数为div   left属性的目标值   第二个为 每次移动多少像素
 
-    }
-    navOpenMenu.nonclick =function ()
+    };
+    noNavOpenMenu.onclick =function ()
     {
-        startmove(-200,-10);
+
+        if (navOpenMenu.offsetLeft >= -10){
+            startmove(-200,-10);
+        }
+
     }
 };
 
@@ -36,5 +40,5 @@ function startmove(target,speed)
             navOpenMenu.style.left=navOpenMenu.offsetLeft+speed+'px';
         }
 
-    },30)
+    },10)
 }