Browse Source

左边导航样式优化

Administrator 7 years ago
parent
commit
bf1a2c2eef
23 changed files with 75 additions and 274 deletions
  1. 0 14
      src/main/webapp/resources/css/add.css
  2. 1 14
      src/main/webapp/resources/css/deputyOrder/order.css
  3. 69 35
      src/main/webapp/resources/css/index.css
  4. 0 14
      src/main/webapp/resources/css/style.css
  5. BIN
      src/main/webapp/resources/img/icon/icon_nav.png
  6. 0 15
      src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html
  7. 0 14
      src/main/webapp/resources/tpl/index/approvalFlow/log.html
  8. 0 14
      src/main/webapp/resources/tpl/index/approvalFlow/user.html
  9. 0 14
      src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html
  10. 0 14
      src/main/webapp/resources/tpl/index/purc/inquiryInfo_detail.html
  11. 0 14
      src/main/webapp/resources/tpl/index/purc/inquiry_new.html
  12. 0 14
      src/main/webapp/resources/tpl/index/purc/pubInquiry_detail.html
  13. 0 14
      src/main/webapp/resources/tpl/index/purc/pubInquiry_new.html
  14. 0 14
      src/main/webapp/resources/tpl/index/purc/purcinquiry_new.html
  15. 0 14
      src/main/webapp/resources/tpl/index/purc/saved_tender.html
  16. 0 14
      src/main/webapp/resources/tpl/index/purc/tender.html
  17. 0 4
      src/main/webapp/resources/tpl/index/purc/tender_answer_detail.html
  18. 0 3
      src/main/webapp/resources/tpl/index/purc/tender_evaluation.html
  19. 5 19
      src/main/webapp/resources/tpl/index/sale/left.html
  20. 0 3
      src/main/webapp/resources/tpl/index/sale/open_tender_detail.html
  21. 0 4
      src/main/webapp/resources/tpl/index/sale/tender.html
  22. 0 4
      src/main/webapp/resources/tpl/index/sale/tender_question_detail.html
  23. 0 5
      src/main/webapp/resources/tpl/index/sale/vendor_tender.html

+ 0 - 14
src/main/webapp/resources/css/add.css

@@ -563,20 +563,6 @@ input:focus, select:focus {
     text-align: left;
 }
 /*产品资料-价格-新增*/
-.com_head {
-    width: 100%;
-    height: 40px;
-    line-height: 43px;
-    background: url(../img/purc/comm_bg01.png) no-repeat center;
-    background-size: 100%;
-}
-
-.com_head span {
-    margin-left: 20px;
-    color: #000;
-    font-size: 14px;
-}
-
 .com_head a {
     color: #327ebe;
     float: right;

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

@@ -29,20 +29,7 @@ body {
 .com_title font {
     color:#327ebe;
 }
-.com_head {
-    width:100%;
-    height:40px;
-    line-height:44px;
-    background:url("../../img/deputyOrder/comm_bg01.png") no-repeat center;
-    background-color:#f5f5f5;
-    background-size: 100%;
-    margin-bottom: -11px;
-}
-.com_head span {
-    margin-left:20px;
-    color:#000;
-    font-size:14px;
-}
+
 .com_head a {
     color:#327ebe;
     float:right;

+ 69 - 35
src/main/webapp/resources/css/index.css

@@ -1041,7 +1041,8 @@ ul>li.item-link>a {
 	width: 185px;
 	float: left;
 	margin-right: 12px;
-	/* border-right: 1px solid #ddd; */
+	padding-bottom:25px;
+	background: #fff;
 }
 
 .body>.right {
@@ -1176,27 +1177,38 @@ ul>li.item-link>a {
 
 .left-nav>ul>li>a {
 	display: block;
-	padding: 6px 20px;
+	padding-left:25px;
 	clear: both;
-	line-height: 1.42857143;
+	line-height: 50px;
 	/*white-space: nowrap;*/
-	font-size: 14px;
+	font-size: 16px;
+	border-bottom:1px dashed #e1e1e1;
+	color:#666;
 }
 
-.use>ul>li:hover,.left-nav>ul>li:hover,.left-nav>ul>li.active {
+.use>ul>li:hover {
 	background-color: #6f6f6f;
 }
 
+.left-nav>ul>li:hover,.left-nav>ul>li.active {
+	background-color: #eee;
+}
+
 .left-nav>ul>li.active {
-	background-color: #6f6f6f;
+	background-color: #eee;
 }
 
-.use>ul>li:hover *,.left-nav>ul>li:hover *,.left-nav>ul>li.active * {
+.use>ul>li:hover *{
 	color: #fff;
 	text-decoration: none;
 	background-color: #6f6f6f;
 }
 
+.left-nav>ul>li:hover *,.left-nav>ul>li.active * {
+	text-decoration: none;
+	background-color: #eee;
+}
+
 .icon-right {
 	float: right;
 	color: #888;
@@ -1205,8 +1217,6 @@ ul>li.item-link>a {
 
 .left-nav {
 	/*margin-top: 10px;*/
-	padding-bottom: 10px;
-	border-bottom: 1px solid #e8e8e8;
 	background-color: #ffffff;
 }
 
@@ -1222,26 +1232,52 @@ ul>li.item-link>a {
 }
 
 .nav-label {
-	text-indent: 35px;
-	height: 40px;
-	line-height: 40px;
-	color: #333333;
+	height: 50px;
+	line-height: 50px;
+	color: #333;
+	font-weight:bold;
 	cursor: pointer;
-	position: relative;
-	background-color: #eaeaea;
-	font-size: 14px;
+	font-size: 16px;
+	padding:0 10px;
+	border-bottom:1px dashed #e1e1e1;
+}
+
+/*.nav-label>i {*/
+	/*position: absolute;*/
+	/*left: 15px;*/
+	/*top: 18px;*/
+	/*width: 0;*/
+	/*height: 0;*/
+	/*border-color: transparent;*/
+	/*border-style: solid;*/
+	/*border-width: 5px 5px 0 5px;*/
+	/*border-top-color: #9ea9c0;*/
+/*}*/
+
+.nav_icon{
+	display:inline-block;
+	width:30px;
+	height:20px;
+	vertical-align: middle;
+	position:relative;
+	top:-3px;
+}
+.nav1_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat 0 0;
 }
 
-.nav-label>i {
-	position: absolute;
-	left: 15px;
-	top: 18px;
-	width: 0;
-	height: 0;
-	border-color: transparent;
-	border-style: solid;
-	border-width: 5px 5px 0 5px;
-	border-top-color: #9ea9c0;
+.nav2_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -28px 0;
+}
+
+.nav3_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -58px 0;
+}
+.nav4_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -88px 0;
+}
+.nav5_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -118px 0;
 }
 
 .left-nav .icon-left {
@@ -2966,7 +3002,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 
 
 /*公共详情*/
-.pub-com_head {
+.pub-com_head, .com_head {
 	width: 100%;
 	height: 45px;
 	line-height: 44px;
@@ -2977,7 +3013,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	/*background-size: 100% 100%;*/
 }
 
-.pub-com_head span {
+.pub-com_head span, .com_head span{
 	margin-left: 10px;
 	color: #fff;
 	font-size: 18px;
@@ -3009,7 +3045,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	display:inline-block;
 	width:20px;
 	height:14px;
-	margin-rihgt:10px;
+	margin-right:10px;
 	vertical-align:middle;
 	background: url("../img/empty/way.png")no-repeat;
 }
@@ -3531,13 +3567,13 @@ input::-webkit-clear{display:none;}
 	width: 10px;
 	height: 10px;
 	display: inline-block;
-	background: #ea5a60;
+	background: #366df3;
 	position: absolute;
 	border-radius: 100%;
-	top: 10px;
+	top: 20px;
 }
 .left-nav>ul>li.active .new-dot,.left-nav>ul>li:hover .new-dot{
-	background: #ea5a60 !important;
+	background: #366df3 !important;
 }
 .left-nav>ul>li a{
 	position: relative;
@@ -3622,9 +3658,7 @@ input::-webkit-clear{display:none;}
 .unPrinted{
 	color: #5078cb !important;
 }
-.left-nav>ul>li:hover a{
-	background: #999;
-}
+
 .textmore{display: block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 #order-detail-list .table-default .header{
 	box-shadow: none;

+ 0 - 14
src/main/webapp/resources/css/style.css

@@ -76,20 +76,6 @@ body {
 	color: #327ebe;
 }
 
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 44px;
-	background: url("../img/approvalFlow/comm_bg01.png") no-repeat center;
-	background-color: #f5f5f5;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;

BIN
src/main/webapp/resources/img/icon/icon_nav.png


+ 0 - 15
src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -17,21 +17,6 @@
 		color: #327ebe;
 	}
 
-	.com_head {
-		width: 100%;
-		height: 40px;
-		line-height: 44px;
-		background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
-		background-color: #f5f5f5;
-		background-size: 100% 100%;
-	}
-
-	.com_head span {
-		margin-left: 20px;
-		color: #000;
-		font-size: 14px;
-	}
-
 	.com_title01 {
 		height: 50px;
 		line-height: 50px;

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

@@ -1,18 +1,4 @@
 <style>
-	.com_head {
-		width: 100%;
-		height: 40px;
-		line-height: 44px;
-		background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
-		background-color: #f5f5f5;
-		background-size: 100% 100%;
-	}
-
-	.com_head span {
-		margin-left: 20px;
-		color: #000;
-		font-size: 14px;
-	}
 	.title-div .pull-right{
 		float: right;
 		margin-right: 15px;

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

@@ -87,20 +87,6 @@
 	-moz-transition: all 0s ease-in-out;
 	transition: all 0s ease-in-out;
 }
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 44px;
-	background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
-	background-color: #f5f5f5;
-	background-size: 100% 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
 .title-div .pull-right{
 	float: right;
 	margin-right: 15px;

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

@@ -297,20 +297,6 @@ input[type="radio"], input[type="checkbox"] {
 	width: 400px;
 }
 
-.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: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;

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

@@ -143,20 +143,6 @@
 	outline: none;
 }
 
-.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: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;

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

@@ -297,20 +297,6 @@
         width: 400px;
     }
 
-    .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: 20px;
-        color: #000;
-        font-size: 14px;
-    }
-
     .com_head a {
         color: #327ebe;
         float: right;

+ 0 - 14
src/main/webapp/resources/tpl/index/purc/pubInquiry_detail.html

@@ -143,20 +143,6 @@
 	outline: none;
 }
 
-.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: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;

+ 0 - 14
src/main/webapp/resources/tpl/index/purc/pubInquiry_new.html

@@ -297,20 +297,6 @@ input[type="radio"], input[type="checkbox"] {
 	width: 400px;
 }
 
-.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: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;

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

@@ -299,20 +299,6 @@ input[type="radio"], input[type="checkbox"] {
 	width: 400px;
 }
 
-.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: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;

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

@@ -316,20 +316,6 @@
         color: #5078cb;
     }
 
-    .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: 20px;
-        color: #000;
-        font-size: 14px;
-    }
-
     .com_head a {
         color: #327ebe;
         float: right;

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

@@ -316,20 +316,6 @@ input[type="radio"], input[type="checkbox"] {
     color: #5078cb;
 }
 
-.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: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;

+ 0 - 4
src/main/webapp/resources/tpl/index/purc/tender_answer_detail.html

@@ -160,10 +160,6 @@
         border: none;
     }
 
-
-
-    .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: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;}

+ 0 - 3
src/main/webapp/resources/tpl/index/purc/tender_evaluation.html

@@ -144,9 +144,6 @@
         outline: none;
     }
 
-
-    .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: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;}

+ 5 - 19
src/main/webapp/resources/tpl/index/sale/left.html

@@ -1,15 +1,9 @@
 <div ng-controller="TodoCtrl">
 	<div class="left-nav">
-		<div class="nav-label">
-			<i></i>基础资料
-		</div>
+		<div class="nav-label"><i class="nav_icon nav1_icon"></i>基础资料</div>
 		<ul class="list-unstyled">
 			<li ui-sref-active="active"><a ui-sref="sale.customer" ng-click="setOrdersRead('customer')"><em class="new-dot" ng-if="unread.customer > 0"></em>客户资料</a></li>
-		</ul>
-		<ul class="list-unstyled">
 			<li ui-sref-active="active"><a ui-sref="sale.vendorPerformanceAssess" ng-click="setOrdersRead('vendorPerformanceAssess')"><em class="new-dot" ng-if="unread.vendorPerformanceAssess > 0"></em>绩效考核</a></li>
-		</ul>
-		<ul class="list-unstyled">
 			<li ui-sref-active="active"><a ui-sref="sale.prodList" ng-click="setOrdersRead('product')"><em class="new-dot" ng-if="unread.product > 0"></em>产品导入</a></li>
 		</ul>
 	</div>
@@ -24,9 +18,7 @@
         </ul>
     </div> -->
 	<div class="left-nav">
-		<div class="nav-label">
-			<i></i>商务管理
-		</div>
+		<div class="nav-label"><i class="nav_icon nav2_icon"></i>商务管理</div>
 		<ul class="list-unstyled">
 			<li ui-sref-active="active"><a ui-sref="sale.inquiry" ng-click="getUnread()"><em class="new-dot" ng-if="unread.inquiry > 0"></em>客户采购询价</a></li>
 			<li ui-sref-active="active"><a ui-sref="sale.pubinquiry" ng-click="getUnread()">客户公共询价</a></li>
@@ -37,9 +29,7 @@
 		</ul>
 	</div>
 	<div class="left-nav">
-		<div class="nav-label">
-			<i></i>订单管理
-		</div>
+		<div class="nav-label"><i class="nav_icon nav3_icon"></i>订单管理</div>
 		<ul class="list-unstyled">
 			<li ui-sref-active="active"><a ui-sref="sale.order" ng-click="getUnread()"><em class="new-dot" ng-if="unread.order > 0"></em>客户采购订单</a></li>
 			<li ui-sref-active="active"><a ui-sref="sale.change"><em class="new-dot" ng-if="unread.change > 0"></em>客户采购变更单</a></li>
@@ -50,18 +40,14 @@
 		</ul>
 	</div>
 	<div class="left-nav">
-		<div class="nav-label">
-			<i></i>样品管理
-		</div>
+		<div class="nav-label"><i class="nav_icon nav4_icon"></i>样品管理</div>
 		<ul class="list-unstyled">
 			<li ui-sref-active="active"><a ui-sref="sale.sample"><em class="new-dot" ng-if="unread.sample > 0"></em>客户打样申请</a></li>
 			<li ui-sref-active="active"><a ui-sref="sale.approval"><em class="new-dot" ng-if="false"></em>客户认定单</a></li>
 		</ul>
 	</div>
 	<div class="left-nav">
-		<div class="nav-label">
-			<i></i>客户出入库
-		</div>
+		<div class="nav-label"><i class="nav_icon nav5_icon"></i>客户出入库</div>
 		<ul class="list-unstyled">
 			<li ui-sref-active="active"><a ui-sref="sale.MRB"><em class="new-dot" ng-if="false"></em>MRB单</a></li>
 			<li ui-sref-active="active"><a ui-sref="sale.badOut"><em class="new-dot" ng-if="false"></em>不良品出库单</a></li>

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

@@ -281,9 +281,6 @@
         width: 400px;
     }
 
-
-    .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: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;}

+ 0 - 4
src/main/webapp/resources/tpl/index/sale/tender.html

@@ -178,10 +178,6 @@
         border: none;
     }
 
-
-
-    .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: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;}

+ 0 - 4
src/main/webapp/resources/tpl/index/sale/tender_question_detail.html

@@ -164,10 +164,6 @@
         border: none;
     }
 
-
-
-    .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: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;}

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

@@ -163,11 +163,6 @@
         border-radius: 0;
         border: none;
     }
-
-
-
-    .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: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;}