Merge branch 'master' of http://192.168.1.12:3000/S.H.I.E.L.D./tiku

Conflicts:
	css/global.css
	index.html

css/global.css

@@ -337,16 +337,22 @@ input.button{
 .indexBanner{
 }
 .indexImg{
+  position:relative;
   margin:0 auto;
   height:520px;
   background: url(banner_bg.png) no-repeat center top;
 }
 .BannerWrap{
+<<<<<<< HEAD
   position:relative;
   height:520px
+=======
+  /*padding-bottom: 24px;*/
+>>>>>>> 6d0866611360e9ca80538683b10a1ef261fe50c3
 }
 .phone .iphone{
   position:absolute;
+<<<<<<< HEAD
   top:50px;
   right:0;
   z-index:999
@@ -373,6 +379,10 @@ input.button{
 .phone.show .android{
   transition: all .5s ease-in-out;
   transform: translateX(-40px);
+=======
+  bottom:0;
+  right:4px;
+>>>>>>> 6d0866611360e9ca80538683b10a1ef261fe50c3
 }
 /*手机动效*/
 .BannerTitle{
@@ -424,7 +434,7 @@ input.button{
   float:left;
   width:140px;
   text-align: center;
-  padding:60px 85px;
+  padding:60px 87px;
   border:1px solid #ececec;
   border-right: none;
 }

index.html

@@ -35,8 +35,13 @@
 	<a href="#" title="纵横题库"><img src="images/logo.png"></a>
 </div>
 <div class="indexBanner">
+<<<<<<< HEAD
 	<div class="indexImg">
 		<div class="BannerWrap width1020">
+=======
+	<div class="indexImg width950">
+		<div class="BannerWrap">
+>>>>>>> 6d0866611360e9ca80538683b10a1ef261fe50c3
 			<h1 class="BannerTitle">工程人的考试专属APP</h1>
 			<div class="code"><img src="images/erweima.png"><p>扫一扫，快捷下载</p><div class="ex"></div></div>
 			<div class="phone">