Преглед изворни кода

1、主要修改首页样式,企业圈页面及页面中含有绿色hover跟按钮。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7466 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin пре 9 година
родитељ
комит
4132a7e577

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

@@ -1052,7 +1052,7 @@ ul>li.item-link>a {
 	padding: 6px 20px;
 	clear: both;
 	line-height: 1.42857143;
-	white-space: nowrap;
+	/*white-space: nowrap;*/
 }
 
 .use>ul>li:hover,.left-nav>ul>li:hover,.left-nav>ul>li.active {
@@ -1407,11 +1407,12 @@ ul>li.item-link>a {
 
 .pane .pane-body {
 	padding: 10px;
+}
+.feed-wrap .pane-body{
 	height: 110px;
 	overflow-y: auto;
 	overflow-x: hidden;
 }
-
 .pane.addon {
 	height: 185px;
 	text-align: center;

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
src/main/webapp/resources/lib/bootstrap/css/bootstrap.min.css


+ 7 - 5
src/main/webapp/resources/tpl/index/baseInfo/enterpriseList.html

@@ -132,7 +132,9 @@
 .info-container .info:hover {
 	color: #CC3333;
 }
-
+.enterprise-hd .btn{
+	border-radius: 0;
+}
 </style>
 <div class="block">
 <div class="loading in" ng-class="{'in': loading}">
@@ -185,10 +187,10 @@
 			<td width="300" class="text-center"><span ng-bind="enterprise.area"></span>
 			</td>
 			<td width="100" class="text-center">
-				<a class="label label-success" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310"><i class="fa fa-user-plus">合作伙伴</i></a>
-				<span class="label label-info" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请</span>
-				<span class="label label-info" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</span>
-				<span class="label label-info" ng-if="enterprise.requestStatus==313">已添加</span>
+				<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">合作伙伴</a>
+				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请</span>
+				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</span>
+				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==313">已添加</span>
 			</td>
 		</tr>
 		<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">

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

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

+ 3 - 3
src/main/webapp/resources/tpl/index/search/search_result.html

@@ -148,9 +148,9 @@
 #resultTop {
 	margin-top: -10px;
 	border-radius: 0px 20px 0px 0px;
-	box-shadow: 0 0 5px #6f6f6f;
-	background-color: #e8e8e8;
-	height: 30px;
+	box-shadow: 0 0 3px #ccc;
+	background: linear-gradient(to top, #e7e7e7 0%,#ffffff 100%);
+	height: 40px;
 	font-size: 14px;
 }
 

Неке датотеке нису приказане због велике количине промена