解决冲突

lszw12345/src/less/app.detail.less

@@ -20,18 +20,6 @@
   -webkit-animation: fadeOutLeftBig 1s;
           animation: fadeOutLeftBig 1s;
 }*/
-
-body{
-    background-color: #FFF;
-    font-family: 'Maven Pro', sans-serif;
-}
-header img{
-    width: 100%;
-
-}
-
-
-
 .home{
   .foot {
       position: fixed;
@@ -262,7 +250,7 @@ header img{
     vertical-align:middle;
     margin-left:10%;
     text-align: center;
-
+    background-color: none;
 }
 .tab-wrap {
     transition: 0.3s box-shadow ease;
@@ -329,12 +317,6 @@ header img{
     box-shadow: 0 1px 0 #f4f4f4 inset;
 }
 
-
-// .asaasas{
-//     width: 98%;
-//     overflow: hidden;
-// }
-
 .tab__content {
     padding: 5px 25px;
     background-color: transparent;

lszw12345/src/less/app.main.less

@@ -22,6 +22,5 @@
 }*/
 
 body{
-    background-color: #F5F5F5;
     font-family: "Arial","Microsoft YaHei","宋体",sans-serif;
 }

lszw12345/src/templates/detail.html

@@ -14,12 +14,12 @@
         <div class="">
             <ul class="list">
                 <li><a href="#"><i class="fa fa-university" aria-hidden="true"></i><b>实施机关</b> <input type="text" readonly class="right" value="丽水莲都区市场监督管理局丽水莲都区市场监督管理局"></a></li>
+                <li><a href="#"><i class="fa fa-gavel" aria-hidden="true"></i><b>权力来源</b> <input type="text" readonly class="right" value="法定本级行使"></a></li>
+                <li><a href="#"><i class="fa fa-home" aria-hidden="true"></i><b>责任处室</b> <input type="text" readonly class="right" value="药品医疗"></a></li>
                 <li><a href="#"><i class="fa fa-user-circle" aria-hidden="true"></i><b>办事对象</b>  <input type="text" readonly class="right" value="个人"></a></li>
-                <li><a href="#"><i class="fa fa-jpy" aria-hidden="true"></i><b>收费情况</b> <input type="text" readonly class="right" value="收费"></a></li>
+                <li><a href="#"><i class="fa fa-jpy" aria-hidden="true"></i><b>办事次数</b> <input type="text" readonly class="right" value="收费"></a></li>
                 <li><a href="#"><i class="fa fa-hourglass-half" aria-hidden="true"></i><b>法定期限</b> <input type="text" readonly class="right" value="无期限"></a></li>
                 <li><a href="#"><i class="fa fa-hourglass-half" aria-hidden="true"></i><b>承诺期限</b> <input type="text" readonly class="right" value="无期限"></a></li>
-                <li><a href="#"><i class="fa fa-gavel" aria-hidden="true"></i><b>权力来源</b> <input type="text" readonly class="right" value="法定本级行使"></a></li>
-                <li><a href="#"><i class="fa fa-home" aria-hidden="true"></i><b>责任处室</b> <input type="text" readonly class="right" value="药品医疗"></a></li>
                 <li><a href="#"><i class="fa fa-home" aria-hidden="true"></i><b>办理地点</b> <input type="text" readonly class="right" value="万象街道梅山社万象街道梅山社区大众街11号"></a></li>
                 <li><a href="#"><i class="fa fa-clock-o" aria-hidden="true"></i><b>受理时间</b><span class="glyphicon glyphicon-menu-right right" ng-click="toggle()"></span></a></li>