Browse Source

去除导航黑点及部分样式对齐调整。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9524 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 8 years ago
parent
commit
21ac87ddc7
25 changed files with 35 additions and 30 deletions
  1. 1 1
      src/main/webapp/resources/css/add.css
  2. 1 1
      src/main/webapp/resources/css/deputyOrder/order.css
  3. 3 3
      src/main/webapp/resources/css/index.css
  4. 1 1
      src/main/webapp/resources/css/public.css
  5. 1 1
      src/main/webapp/resources/css/style.css
  6. BIN
      src/main/webapp/resources/img/approvalFlow/comm_bg01.png
  7. BIN
      src/main/webapp/resources/img/approvalFlow/comm_bg02.png
  8. BIN
      src/main/webapp/resources/img/comm_bg01.png
  9. BIN
      src/main/webapp/resources/img/deputyOrder/comm_bg01.png
  10. BIN
      src/main/webapp/resources/img/purc/comm_bg01.png
  11. 2 3
      src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html
  12. 1 1
      src/main/webapp/resources/tpl/index/approvalFlow/log.html
  13. 1 1
      src/main/webapp/resources/tpl/index/approvalFlow/user.html
  14. 1 1
      src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html
  15. 5 5
      src/main/webapp/resources/tpl/index/purc/inquiry.html
  16. 1 1
      src/main/webapp/resources/tpl/index/purc/inquiryInfo_detail.html
  17. 1 1
      src/main/webapp/resources/tpl/index/purc/inquiry_new.html
  18. 1 1
      src/main/webapp/resources/tpl/index/purc/purcinquiry_new.html
  19. 1 1
      src/main/webapp/resources/tpl/index/purc/saved_tender.html
  20. 1 1
      src/main/webapp/resources/tpl/index/purc/tender.html
  21. 5 2
      src/main/webapp/resources/tpl/index/purc/tender_evaluation.html
  22. 1 1
      src/main/webapp/resources/tpl/index/sale/open_tender_detail.html
  23. 1 1
      src/main/webapp/resources/tpl/index/sale/quotation_new.html
  24. 5 2
      src/main/webapp/resources/tpl/index/sale/tender.html
  25. 1 1
      src/main/webapp/resources/tpl/index/sale/vendor_tender.html

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

@@ -480,7 +480,7 @@ input:focus, select:focus {
 }
 
 .com_head span {
-    margin-left: 30px;
+    margin-left: 20px;
     color: #000;
     font-size: 14px;
 }

+ 1 - 1
src/main/webapp/resources/css/deputyOrder/order.css

@@ -39,7 +39,7 @@ body {
     margin-bottom: -11px;
 }
 .com_head span {
-    margin-left:40px;
+    margin-left:20px;
     color:#000;
     font-size:14px;
 }

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

@@ -1196,7 +1196,7 @@ ul>li.item-link>a {
 }
 
 .todo .todo-label label{
-	margin-left: 10px;
+	/*margin-left: 10px;*/
 	font-family: Microsoft YaHei, SimHei, Verdana;
 	font-size: 14px;
 }
@@ -2746,7 +2746,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 }
 
 .pub-com_head span {
-	margin-left: 30px;
+	margin-left: 20px;
 	color: #000;
 	font-size: 14px;
 }
@@ -2765,7 +2765,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 .title-div {
 	font-size: 14px;
 	font-weight: 600;
-	padding-left: 24px;
+	padding-left: 20px !important;
 	height: 50px;
 	padding-top: 11px;
 }

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

@@ -51,7 +51,7 @@
 }
 
 .pub-com_head span {
-    margin-left: 30px;
+    margin-left: 20px;
     color: #000;
     font-size: 14px;
 }

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

@@ -85,7 +85,7 @@ body {
 }
 
 .com_head span {
-	margin-left: 40px;
+	margin-left: 20px;
 	color: #000;
 	font-size: 14px;
 }

BIN
src/main/webapp/resources/img/approvalFlow/comm_bg01.png


BIN
src/main/webapp/resources/img/approvalFlow/comm_bg02.png


BIN
src/main/webapp/resources/img/comm_bg01.png


BIN
src/main/webapp/resources/img/deputyOrder/comm_bg01.png


BIN
src/main/webapp/resources/img/purc/comm_bg01.png


+ 2 - 3
src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -27,7 +27,7 @@
 }
 
 .com_head span {
-	margin-left: 30px;
+	margin-left: 20px;
 	color: #000;
 	font-size: 14px;
 }
@@ -57,13 +57,12 @@
 	height: 35px;
 	line-height: 35px;
 }
-
 #company .com-text .title {
 	font-size: 14px;
 	font-weight: inherit;
 	color: #323232;
 	width: 120px;
-	padding-left: 20px;
+	padding-left: 5px;
 }
 
 #company .com-text .content {

+ 1 - 1
src/main/webapp/resources/tpl/index/approvalFlow/log.html

@@ -9,7 +9,7 @@
 	}
 
 	.com_head span {
-		margin-left: 30px;
+		margin-left: 20px;
 		color: #000;
 		font-size: 14px;
 	}

+ 1 - 1
src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -97,7 +97,7 @@
 }
 
 .com_head span {
-	margin-left: 30px;
+	margin-left: 20px;
 	color: #000;
 	font-size: 14px;
 }

+ 1 - 1
src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -306,7 +306,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .com_head span {
-	margin-left: 30px;
+	margin-left: 20px;
 	color: #000;
 	font-size: 14px;
 }

+ 5 - 5
src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -4,7 +4,7 @@
 	/*margin-top: 20px;*/
 }
 .view-slide-in .block {
-	background: #f5f5f5;
+	background: #fff;
 }
 .view-slide-in .group-container {
 	background: #fff;
@@ -39,10 +39,10 @@
 .view-slide-in .group-container {
 	padding: 0;
 }
-.view-slide-in .search-bg {
+/*.view-slide-in .search-bg {
 	margin-top: 15px;
 	margin-bottom: 15px;
-}
+}*/
 #topSearch {
 	font-size: 18px;
 }
@@ -290,7 +290,7 @@ margin-left: 55px;
 		<i></i>
 	</div>
 	<div class="menu condition block">
-		<div class="row">
+		<div class="row" style="border-bottom: 16px solid #f5f5f5; height: 56px;">
 			<div class="col-xs-9">
 				<div class="btn-group btn-group-sm btn-group-justified">
 					<div class="btn-group btn-group-sm">
@@ -326,7 +326,7 @@ margin-left: 55px;
 		</div>
 	</div>
 	<div class="condition block">
-		<div class="search-bg condition block" style="padding: 10px 15px;">
+		<div class="search-bg condition block">
 			<div class="row">
 				<div id="topSearch" style="float: left">
 					<a ng-click="changeDateZone(1);condition.$open=false" title="最近一个月" ng-class="{'active':condition.dateZone=='1'}">最近一个月</a>

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

@@ -152,7 +152,7 @@
 }
 
 .com_head span {
-	margin-left: 30px;
+	margin-left: 20px;
 	color: #000;
 	font-size: 14px;
 }

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

@@ -306,7 +306,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .com_head span {
-	margin-left: 30px;
+	margin-left: 20px;
 	color: #000;
 	font-size: 14px;
 }

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

@@ -308,7 +308,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .com_head span {
-	margin-left: 30px;
+	margin-left: 20px;
 	color: #000;
 	font-size: 14px;
 }

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

@@ -325,7 +325,7 @@
     }
 
     .com_head span {
-        margin-left: 30px;
+        margin-left: 20px;
         color: #000;
         font-size: 14px;
     }

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

@@ -325,7 +325,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .com_head span {
-	margin-left: 30px;
+	margin-left: 20px;
 	color: #000;
 	font-size: 14px;
 }

+ 5 - 2
src/main/webapp/resources/tpl/index/purc/tender_evaluation.html

@@ -32,7 +32,9 @@
         margin-top: 3px;
         margin-bottom: 3px;
     }
-
+    .bid-content > div > div.col-xs-4, .bid-content > div > div.col-xs-12{
+        padding-left: 5px;
+    }
     /* 读取显示无法修改的数据 */
     .unchanged-info {
         color: #969595;
@@ -52,6 +54,7 @@
     .bid-desc {
         width: 100px;
         float: left;
+        text-align: left !important;
     }
 
     /* 输入框 */
@@ -143,7 +146,7 @@
 
 
     .com_head{width:100%;height:40px;line-height:42px;background:url(static/img/comm_bg01.png) no-repeat center;background-size: 100%;}
-    .com_head span{margin-left:30px;color:#000;font-size:14px;}
+    .com_head span{margin-left:20px;color:#000;font-size:14px;}
     .com_head a{color:#327ebe;float:right;margin-right:40px;font-size: 14px;}
     .com_head a i{margin-left: 5px;line-height: 40px;}
     .com_head a:hover{color: #d2272d;}

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

@@ -283,7 +283,7 @@
 
 
     .com_head{width:100%;height:40px;line-height:42px;background:url(static/img/comm_bg01.png) no-repeat center;background-size: 100%;}
-    .com_head span{margin-left:30px;color:#000;font-size:14px;}
+    .com_head span{margin-left:20px;color:#000;font-size:14px;}
     .com_head a{color:#327ebe;float:right;margin-right:40px;font-size: 14px;}
     .com_head a i{margin-left: 5px;line-height: 40px;}
     .com_head a:hover{color: #d2272d;}

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

@@ -74,7 +74,7 @@
 .title-div {
 	font-size: 14px;
 	font-weight: 600;
-	padding-left: 30px;
+	padding-left: 20px;
 	height: 50px;
 	padding-top: 11px;
 }

+ 5 - 2
src/main/webapp/resources/tpl/index/sale/tender.html

@@ -38,7 +38,7 @@
     .title-div {
         font-size: 14px;
         font-weight: 600;
-        padding-left: 30px;
+        padding-left: 20px;
         height: 50px;
         padding-top: 11px;
     }
@@ -48,6 +48,9 @@
         width: 100px;
         float: left;
     }
+    .bid-content>div>div.col-xs-4{
+        padding-left: 5px;
+    }
     /* 输入框 */
     .bid-input {
         border: none;
@@ -170,7 +173,7 @@
 
 
     .com_head{width:100%;height:40px;line-height:42px;background:url(static/img/comm_bg01.png) no-repeat center;background-size: 100%;}
-    .com_head span{margin-left:30px;color:#000;font-size:14px;}
+    .com_head span{margin-left:20px;color:#000;font-size:14px;}
     .com_head a{color:#327ebe;float:right;margin-right:40px;font-size: 14px;}
     .com_head a i{margin-left: 5px;line-height: 40px;}
     .com_head a:hover{color: #d2272d;}

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

@@ -167,7 +167,7 @@
 
 
     .com_head{width:100%;height:40px;line-height:42px;background:url(static/img/comm_bg01.png) no-repeat center;background-size: 100%;}
-    .com_head span{margin-left:30px;color:#000;font-size:14px;}
+    .com_head span{margin-left:20px;color:#000;font-size:14px;}
     .com_head a{color:#327ebe;float:right;margin-right:40px;font-size: 14px;}
     .com_head a i{margin-left: 5px;line-height: 40px;}
     .com_head a:hover{color: #d2272d;}