logo下移，其他页面文字太多挤出现象调整。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7922 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/css/index.css

@@ -898,7 +898,7 @@ ul>li.item-link>a {
 }
 
 #header .navbar-header .navbar-brand {
-	background: url("../img/logo/logo.png") no-repeat bottom;
+	background: url("../img/logo/logo.png") no-repeat center;
 	width: 218px;
 	margin: 0;
 }
@@ -2738,10 +2738,10 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	background: #fff;
 	z-index: 2;
 }
-#order-detail-list .text-inverse{
+/*#order-detail-list .text-inverse{
 	width: 100%;
 	display: inline-block;
-}
+}*/
 /*弹框搜索*/
 #window-search .form-control{
 	height: 36px;

src/main/webapp/resources/css/public.css

@@ -22,6 +22,7 @@
 #public .search-bg .input-group-addon{width: 70px;height: 36px;display: inline-block;background: #327ebe;font-size: 16px;text-align: center;line-height: 36px;color: #fff;padding: 0;border: none;border-radius: 0;position: absolute;top: 0;right: 0;}
 #public .order-table .header th,#public .inquiry-table .header th{height: 40px;line-height: 40px;background: none;font-size: 14px;}
 #public .order-table .order-hd,#public .inquiry-table .inquiry-hd{font-size: 14px;}
+#public .order-table .order-hd{ line-height: normal;}
 #public .order-table .order-bd,#public .inquiry-table .inquiry-bd{height: 100px;}
 #public .order-table .order-bd .product,#public .inquiry-table .inquiry-bd .product{line-height: 30px;font-size: 14px;}
 .height10{width: 100%;height: 10px;background: #f5f5f5;}

src/main/webapp/resources/tpl/index/make/order.html

@@ -223,7 +223,7 @@
 	<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th width="80">单价</th>
+			<th width="100">单价</th>
 			<th width="100">数量</th>
 			<th width="100">交货日期</th>
 			<th width="180">单据状态</th>

src/main/webapp/resources/tpl/index/purc/order.html

@@ -177,8 +177,8 @@
 				</div>
 			</div>
 			<div class="buy-cart col-xs-1">
-				<a id="add" ui-sref="purc.newOrder"><img src="resources/img/icon/add.png"/></a>
-				<a id="add" ui-sref="purc.newOrder"><img src="resources/img/icon/cart.png"/></a>
+				<a id="add" ui-sref="purc.newOrder" title="新增采购单"><img src="resources/img/icon/add.png"/></a>
+				<a id="add" ui-sref="purc.newOrder" title="购物车"><img src="resources/img/icon/cart.png"/></a>
 			</div>
 		</div>
 	</div>

src/main/webapp/resources/tpl/index/purc/order_detail.html

@@ -5,7 +5,7 @@
 	<div class="pub-com_head">
 		<span>采购单</span>
 		<div class="p-right">
-			!-- <a ng-click="print(order)" class="pull-right text-simple"><i
+			<!-- <a ng-click="print(order)" class="pull-right text-simple"><i
 				class="fa fa-print fa-fw"></i>打印</a> -->
 		</div>
 	</div>

src/main/webapp/resources/tpl/index/sale/change_detail.html

@@ -1,3 +1,8 @@
+<style>
+	#order-detail-list .table-default .header th{
+		display: inline-block;
+	}
+</style>
 <div class="pane base-info" id="order-detail-list">
 	<div class="pub-com_head">
 		<span>客户采购变更单</span>

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -255,7 +255,7 @@
 		<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th width="90"><span class="text-default">≥</span>分段数</th>
+			<th width="110"><span class="text-default">≥</span>分段数</th>
 			<th width="90">价格</th>
 			<th width="80">最小订购</th>
 			<th width="80">最小包装</th>

src/main/webapp/resources/tpl/index/sale/quotation_new.html

@@ -50,7 +50,7 @@
 .status {
 	position: absolute;
   	height: 50px;
-  	width: 100px;
+  	min-width: 100px;
   	/* border-radius: 50px; */
   	border: dashed 2px #999;
   	border-radius: 13px;

src/main/webapp/resources/tpl/index/sale/right.html

@@ -79,7 +79,7 @@
 	right: -100px;
 	top: 0;
 	width: 100px;
-	height: 118px;
+	height: 100px;
 	background-color: #494949;
 	border-radius: 2px 0 0 2px;
 	-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .2);
@@ -97,7 +97,7 @@
 .item-wrap .tip:after {
 	position: absolute;
 	content: '';
-	top: 30%;
+	top: 44%;
 	right: -10px;
 	width: 0;
 	height: 0;
@@ -118,15 +118,19 @@
 
 .item-wrap .tip>ul>li {
 	color: #fff;
-	padding: 10px;
+	padding: 0 10px;
 	border-bottom: 1px solid #f6f6f6;
 	-webkit-transition: all 0.15s ease-in-out;
 	-moz-transition: all 0.15s ease-in-out;
 	transition: all 0.15s ease-in-out;
+	height: 50px;
 }
 
 .item-wrap .tip>ul>li>a {
 	color: #fff;
+	width: 100%;
+	display: inline-block;
+	padding-top: 5px;
 }
 
 .item-wrap .tip>ul>li:hover {

src/main/webapp/resources/tpl/index/sale/sample_send.html

@@ -1,3 +1,11 @@
+<style>
+	.sampleSend label{
+		font-weight: inherit;
+	}
+	.modal-body .row{
+		line-height: 34px;
+	}
+</style>
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>

src/main/webapp/resources/tpl/index/sale/tender.html

@@ -216,7 +216,7 @@
     <form name="bidForm">
         <div class="purc-bid">
             <div class="list-unstyled">
-                <div class="com_title">服务>招标<font>>投标中</font></div>
+                <!--<div class="com_title">服务>招标<font>>投标中</font></div>-->
                 <div class="com_head"><span>投标单</span></div>
             </div>
             <div class="bid-content ng-scope" ng-controller="SaleTenderDetailCtrl">