ソースを参照

1、一些小细节样式修改,改动不大。主要改了企业圈合作伙伴的页面。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7472 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 年 前
コミット
c1ae1e879f

+ 3 - 2
src/main/webapp/resources/css/index.css

@@ -1663,7 +1663,7 @@ ul>li.item-link>a {
 	width: 25px;
 	height: 24px;
 	line-height: 24px;
-	background: #56a022;
+	background: #327ebe;
 	color: #fff;
 	text-align: center;
 	border-radius: 0 2px 2px 0;
@@ -2409,7 +2409,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	padding-bottom: 10px;
 }
 .dropdown-tab .nav-pills>li{
-	width: 16.66666%;
+	width: 16%;
 	text-align: left;
 	line-height: 40px;
 }
@@ -2506,6 +2506,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 }
 .feed-wrap .carousel-indicators{
 	bottom: -10px;
+	left: 125px;
 }
 .feed-wrap .carousel-indicators li{
 	background: #c2c2c2;

+ 1 - 1
src/main/webapp/resources/css/style.css

@@ -121,7 +121,7 @@ body {
 }
 
 .com_content ul li .inco01 img {
-	margin-top: 26px;
+	/*margin-top: 26px;*/
 	margin-left: 45px;
 }
 

ファイルの差分が大きいため隠しています
+ 0 - 0
src/main/webapp/resources/lib/bootstrap/css/bootstrap.min.css


+ 15 - 16
src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -45,11 +45,10 @@
 }
 
 .order-table .order-hd {
-	background: #f5f5f5;
-	height: 40px;
-	line-height: 40px;
+	background: #fff;
+	height: 50px;
+	line-height: 50px;
 }
-
 .order-table .order-hd td.first {
 	padding-left: 20px;
 }
@@ -68,14 +67,12 @@
 }
 
 .order-table>tbody {
-	border: 1px solid transparent;
+	border-bottom: 1px #e8e8e8 dotted;
 }
 
 .order-table>tbody:hover {
-	border-color: #56a022;
-	border-width: 2px;
+	border: #d32526 2px solid;
 }
-
 .order-table .operates {
 	display: none;
 }
@@ -132,7 +129,9 @@
 .info-container .info:hover {
 	color: #CC3333;
 }
-
+.white{
+	color: #fff;
+}
 </style>
 <div class="block">
 <div class="loading in" ng-class="{'in': loading}">
@@ -218,13 +217,13 @@
 				<span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>
 			</td>
 			<td colspan="1" class="text-center">
-				<a class="label label-success" ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>供应商 </a>
-				&nbsp;<a class="label label-danger" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>客户</a>
-				<a  class="label label-success" ng-click="agree(request.id)" ng-if="request.statusCode==311 && request.method==0">通过 </a>
-				&nbsp;<a  class="label label-danger" ng-click="refuse(request.id, request.reason)" ng-if="request.statusCode==311 && request.method==0">拒绝</a>
-				<span class="label label-info" ng-if="request.statusCode==311 && request.method==1">等待处理</span>
-				<span class="label label-danger" ng-if="request.statusCode==310 && request.method==1">对方已拒绝</span>
-				<span class="label label-danger" ng-if="request.statusCode==310 && request.method==0">已拒绝对方</span>
+				<a class="btn label-success white" ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>供应商 </a>
+				&nbsp;<a class="btn label-danger white" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>客户</a>
+				<a  class="btn label-success white" ng-click="agree(request.id)" ng-if="request.statusCode==311 && request.method==0">通过 </a>
+				&nbsp;<a  class="btn  label-danger white" ng-click="refuse(request.id, request.reason)" ng-if="request.statusCode==311 && request.method==0">拒绝</a>
+				<span class="btn label-info white" ng-if="request.statusCode==311 && request.method==1">等待处理</span>
+				<span class="btn label-danger white" ng-if="request.statusCode==310 && request.method==1">对方已拒绝</span>
+				<span class="btn label-danger white" ng-if="request.statusCode==310 && request.method==0">已拒绝对方</span>
 			</td>
 		</tr>
 	</tbody>

+ 4 - 1
src/main/webapp/resources/tpl/index/purc/tender.html

@@ -6,7 +6,10 @@
         height: 30px;
         margin-left: 10px;
         margin-right: 10px;
-        background-color: #e8e8e8;
+        background: linear-gradient(to top, #e7e7e7 0%,#ffffff 100%);
+        height: 40px;
+        margin-top: 20px;
+        line-height: 40px;
         box-shadow: 0 0 5px #6f6f6f;
         border-top-right-radius: 20px;
     }

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/order.html

@@ -72,7 +72,7 @@
 }
 
 .order-table>tbody:hover {
-	border-color: #56a022;
+	border-color: #d32526;
 	border-width: 2px;
 }
 

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません