Merge branch 'wangying' of http://192.168.2.91/gitlab/iot-project-js/doorlock into zjx

History.md

-1.0.9 / 2017-10-12
+1.1.0 / 2017-10-17
+
+==================
+ * 1.修改绑定开锁信息页面样式
+
+1.0.9 / 2017-10-12
 
 ==================
  * 1.上传门锁管理、门锁用户、邀请绑定、绑定开锁信息页面样式

web/lib/less/doorlockUsers/unlockInfo.less

@@ -69,29 +69,31 @@
 	ul{
 	    padding: 11px 42px;
 	    font-size: 0;
-	    margin: 0 -12px;	
+	    margin: 0 -5px;	
 	    li{	
 			color: #00ffff;
-		    font-size: 14px;
+		    font-size: 13px;
 			border: 1px solid;/*no*/
 			position: relative;
-			width: 80px;
+			width: 90px;
 		    display: inline-block;
 		    text-align: center;
 		    line-height: 1;
 		    padding: 8px 0;
 		    border-radius: 5px;
-		    margin: 10px 12px;
-		    &:after{
+		    margin: 10px 5px;
+		    &:before{
 		    	content: '\e631';
-		    	.transformV_center(left,5px);
-		    	.iconfont(16px);
+		    	position: absolute;
+		    	top: 50%;
+		    	.transform(translate(-14px,-50%));
+		    	.iconfont(12px);
 		    	display: none;
 		    }
 		    &.active{
 		    	background-color: #153D4C;
-				&:after{
-					display: block;
+				&:before{
+					display: inline-block;
 				}
 		    }			
 		}

web/view/doorlockUsers/unlockInfo.css

@@ -532,32 +532,31 @@ p {
 .opendoorMode ul {
   padding: 0.293rem 1.12rem;
   font-size: 0;
-  margin: 0 -0.32rem;
+  margin: 0 -0.133rem;
 }
 
 .opendoorMode ul li {
   color: #00ffff;
-  font-size: 0.373rem;
+  font-size: 0.347rem;
   border: 1px solid;
   position: relative;
-  width: 2.133rem;
+  width: 2.4rem;
   display: inline-block;
   text-align: center;
   line-height: 1;
   padding: 0.213rem 0;
   border-radius: 0.133rem;
-  margin: 0.267rem 0.32rem;
+  margin: 0.267rem 0.133rem;
 }
 
-.opendoorMode ul li:after {
+.opendoorMode ul li:before {
   content: '\e631';
   position: absolute;
   top: 50%;
-  left: 0.133rem;
-  -webkit-transform: translateY(-50%);
-  transform: translateY(-50%);
+  -webkit-transform: translate(-0.373rem, -50%);
+  transform: translate(-0.373rem, -50%);
   font-family: iconfont;
-  font-size: 0.427rem;
+  font-size: 0.32rem;
   -webkit-font-smoothing: antialiased;
   line-height: 1;
   display: none;
@@ -567,8 +566,8 @@ p {
   background-color: #153D4C;
 }
 
-.opendoorMode ul li.active:after {
-  display: block;
+.opendoorMode ul li.active:before {
+  display: inline-block;
 }
 
 .u-select {