cssMerge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

# Conflicts:
#	uni.scss

assets/css/index/index.scss

@@ -111,8 +111,9 @@
 				top:75rpx;
 				top:75rpx;
 				left:-150rpx;
 				left:-150rpx;
 				z-index: 2;
 				z-index: 2;
-				navigator{
+				a{
 					height:73rpx;
 					height:73rpx;
+					
 					display: block;
 					display: block;
 					width: 152rpx;
 					width: 152rpx;
 					border-bottom: 1rpx solid #484B59;
 					border-bottom: 1rpx solid #484B59;
@@ -146,7 +147,7 @@
 		overflow: hidden;
 		overflow: hidden;
 		border-radius: 10rpx;
 		border-radius: 10rpx;
 		swiper{height:302rpx;}
 		swiper{height:302rpx;}
-		navigator{
+		a{
 			display: block;
 			display: block;
 			width:702rpx;
 			width:702rpx;
 			height:100%;
 			height:100%;
@@ -165,11 +166,30 @@
 .ggbox{
 .ggbox{
 		width:702rpx;
 		width:702rpx;
 		margin:0 auto;
 		margin:0 auto;
-		height:81rpx;
+		height:42px;
 		border-bottom: 1px solid #F0F0F2;
 		border-bottom: 1px solid #F0F0F2;
-		line-height: 81rpx;
+		line-height: 42px;
 		color:$uni-color666;
 		color:$uni-color666;
 		font-size: 24rpx;
 		font-size: 24rpx;
+		box-sizing: border-box;
+		.ggcons{
+			position: relative;
+			overflow-y: hidden;
+			width:676rpx;
+			height:16px;
+			box-sizing: border-box;
+			
+			.ggsec{
+				position: absolute;
+				width:100%;
+				transition: all 1s;
+				a{
+					cursor: pointer;height:16px;color: #484B59;font-size: 24rpx;line-height: 16px;
+					.titletext{max-width:620rpx;height:16px;line-height: 16px;}
+				}
+			}
+		}
+		
 		.icon{
 		.icon{
 			margin-right: 11rpx;
 			margin-right: 11rpx;
 			font-size: 32rpx;
 			font-size: 32rpx;
@@ -180,10 +200,11 @@
 	width:704rpx;
 	width:704rpx;
 	margin:0 auto;
 	margin:0 auto;
 	margin-top: 27rpx;
 	margin-top: 27rpx;
-	navigator{
+	a{
 		display: block;
 		display: block;
 		width:164rpx;
 		width:164rpx;
 		height:136rpx;
 		height:136rpx;
+		
 		image{
 		image{
 			display: block;
 			display: block;
 			width:164rpx;
 			width:164rpx;
@@ -248,11 +269,12 @@
 		border-radius: 0rpx 0rpx 10rpx 10rpx;
 		border-radius: 0rpx 0rpx 10rpx 10rpx;
 		flex-wrap: wrap;
 		flex-wrap: wrap;
 		padding-left:24rpx;
 		padding-left:24rpx;
-		navigator{
+		a{
 			width: 144rpx;
 			width: 144rpx;
+			display: block;
 			height: 81rpx;
 			height: 81rpx;
 			display: block;
 			display: block;
-			margin-right: 26rpx;
+			margin-right: 28rpx;
 			margin-bottom: 16rpx;
 			margin-bottom: 16rpx;
 			image{
 			image{
 				width: 144rpx;
 				width: 144rpx;
@@ -498,3 +520,5 @@
 	}
 	}
 }
 }
 
 
+
+

assets/css/mine/login.scss

@@ -129,3 +129,10 @@
         }
         }
     }
     }
 }
 }
+
+.mb24 {
+    margin-bottom: 24rpx;
+}
+.mb40 {
+    margin-bottom: 40rpx;
+}

uni.scss

@@ -12,12 +12,6 @@ $uni-sz12: 12rpx;
 $uni-sz14: 14rpx;
 $uni-sz14: 14rpx;
 $uni-fz16: 16rpx;
 $uni-fz16: 16rpx;
 
 
-html,
-body {
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-}
-
 view,
 view,
 text,
 text,
 input,
 input,
@@ -26,6 +20,9 @@ navigator {
     box-sizing: border-box;
     box-sizing: border-box;
     font-family: PingFangSC-Semibold, PingFang SC;
     font-family: PingFangSC-Semibold, PingFang SC;
 }
 }
+a {
+    text-decoration: none;
+}
 .navigator-hover {
 .navigator-hover {
     background: none;
     background: none;
     opacity: 1;
     opacity: 1;
@@ -86,7 +83,6 @@ image {
 .mb24 {
 .mb24 {
     margin-bottom: 24rpx;
     margin-bottom: 24rpx;
 }
 }
-
 .mb40 {
 .mb40 {
     margin-bottom: 40rpx;
     margin-bottom: 40rpx;
 }
 }