Merge remote-tracking branch 'origin/release/live' into release/live

@@ -37,7 +37,7 @@
             <div class="liverec_info">
             <div class="liverec_info">
                 <img class="liverec_head" src="{{image master_pic 120 120}}" alt="头像">
                 <img class="liverec_head" src="{{image master_pic 120 120}}" alt="头像">
                 <div class="liverec_pannel">
                 <div class="liverec_pannel">
-                    <p class="liverec_name">
+                    <p class="liverec_name clearfix">
                         <span class="name-name">{{master_name}}</span>
                         <span class="name-name">{{master_name}}</span>
                         <span class="name-tag">{{master_meta}}</span>
                         <span class="name-tag">{{master_meta}}</span>
                     </p>
                     </p>

@@ -12,12 +12,11 @@ $border: #e0e0e0;
 }
 }
 
 
 .liverec {
 .liverec {
-    height: 423px;
     width: 640px;
     width: 640px;
+    overflow: hidden;
 
 
     &_child {
     &_child {
         position: relative;
         position: relative;
-        height: 100%;
         width: 50%;
         width: 50%;
         float: left;
         float: left;
         border-right: 1px solid $border;
         border-right: 1px solid $border;
@@ -69,7 +68,6 @@ $border: #e0e0e0;
 }
 }
 
 
 .liverec_info {
 .liverec_info {
-    height: 100px;
     padding: 20px 10px 20px 30px;
     padding: 20px 10px 20px 30px;
 }
 }
 
 
@@ -94,23 +92,27 @@ $border: #e0e0e0;
 
 
     .name-name {
     .name-name {
         display: inline-block;
         display: inline-block;
-        height: 26px;
-        max-width: 85px;
+        max-width: 105px;
+        text-overflow: ellipsis;
         overflow: hidden;
         overflow: hidden;
+        white-space: nowrap;
     }
     }
 
 
     .name-tag {
     .name-tag {
         display: inline-block;
         display: inline-block;
+        float: right;
         font-size: 18px;
         font-size: 18px;
         height: 26px;
         height: 26px;
+        max-width: 100%;
         line-height: 26px;
         line-height: 26px;
         padding: 0 8px;
         padding: 0 8px;
-        max-width: 90px;
         text-align: center;
         text-align: center;
         background: $black;
         background: $black;
         border-radius: 20px;
         border-radius: 20px;
         color: $white;
         color: $white;
         vertical-align: top;
         vertical-align: top;
+        white-space: nowrap;
+        text-overflow: ellipsis;
     }           
     }           
 }
 }