Browse Source

调整页面右边栏显示

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7554 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 years ago
parent
commit
80d4ee5927

+ 15 - 41
src/main/webapp/resources/tpl/index/fa/right.html

@@ -1,28 +1,16 @@
-<div ui-view class="sale-view"></div>
+<div ui-view class="sale-view view-slide-in"></div>
 <style>
 .rbar {
 	opacity: 1;
-	width: 34px;
-	height: 100%;
+	width: 80px;
 	position: fixed;
-	top: 0;
+	top: 50%;
 	right: 0;
-	padding-top: 85px;
 	color: #555;
-	-webkit-box-shadow: 0 0 7px 0 rgba(119, 119, 119, 0.2);
-	box-shadow: 0 0 7px 0 rgba(119, 119, 119, 0.2);
-	background-color: #fafafa;
-	background: -webkit-linear-gradient(left, #e9e9e9, #fafafa);
-	background: -moz-linear-gradient(left, #e9e9e9, #fafafa);
-	background: -o-linear-gradient(left, #e9e9e9, #fafafa);
-	background: -ms-linear-gradient(left, #e9e9e9, #fafafa);
-	background: linear-gradient(left, #e9e9e9, #fafafa);
-	border-left: 1px solid #d9d9d9;
 	zoom: 1;
 	z-index: 2;
-	background: -o-linear-gradient(left, #e9e9e9, #fafafa);
+	background-color: #969595;
 }
-
 .rbar a:hover {
 	color: #fff;
 }
@@ -32,29 +20,29 @@
 }
 
 .rbar .item-wrap {
+	padding-top: 15px;
 	position: relative;
 	cursor: pointer;
 	text-align: center;
 	font-family: "Microsoft YaHei", SimHei, "WenQuanYi Micro Hei", STHeiti;
-	border-bottom: 1px solid #f9f9f9;
 	-webkit-transition: all 0.15s ease-in-out;
 	-moz-transition: all 0.15s ease-in-out;
 	transition: all 0.15s ease-in-out;
 }
 
 .rbar .item-inner {
-	border-bottom: 1px solid #e3e3e3;
-	width: 34px;
+	border-bottom: 1px solid #ffffff;
+	width: 80px;
 	display: block;
+	color: #ffffff;
 }
 
 .rbar .item-wrap:hover {
-	background-color: #56a022;
+	background-color: #6f6f6f;
 	color: #fff;
 }
 
 .rbar .inner-text {
-	width: 20px;
 	padding: 10px 0 5px 0;
 	margin: auto;
 	text-align: center;
@@ -67,7 +55,6 @@
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;
-	background-color: #56a022;
 }
 
 .item-wrap:hover .badge {
@@ -100,7 +87,7 @@
 .item-wrap .tip:after {
 	position: absolute;
 	content: '';
-	top: 30%;
+	top: 20%;
 	right: -10px;
 	width: 0;
 	height: 0;
@@ -111,7 +98,7 @@
 
 .item-wrap:hover .tip {
 	opacity: 1;
-	right: 32px;
+	right: 80px;
 }
 
 .item-wrap .tip>ul {
@@ -133,11 +120,11 @@
 }
 
 .item-wrap .tip>ul>li:hover {
-	background-color: #56a022;
+	background-color: #6f6f6f;
 }
 
 .rbar .bar-bottom {
-	position: absolute;
+	position: relative;
 	bottom: 0;
 	left: 0;
 	border-top: 1px solid #e3e3e3;
@@ -158,23 +145,10 @@
 	<div class="bar-center" ng-controller="TodoCtrl">
 		<div class="item-wrap">
 			<a class="item-inner" ui-sref="fa.arCheck"> <span
-				class="inner-text">应付对账单</span> <span class="badge"
-				ng-bind="todo.arCheckToConfirm"></span>
+				class="inner-text">应付对账单</span> (<span class="text-inverse"
+				ng-bind="todo.arCheckToConfirm"></span>
 			</a>
 		</div>
 	</div>
-	<div class="bar-bottom">
-		<div class="item-wrap">
-			<div class="item-inner">
-				<span class="inner-text"><i
-					class="fa fa-fw fa-headphones fa-lg"></i></span>
-			</div>
-		</div>
-		<div class="item-wrap">
-			<div class="item-inner">
-				<span class="inner-text"><i class="fa fa-fw fa-tablet fa-lg"></i></span>
-			</div>
-		</div>
-	</div>
 </div>
 <!-- right static-bar End -->

+ 23 - 36
src/main/webapp/resources/tpl/index/sale/right.html

@@ -2,27 +2,15 @@
 <style>
 .rbar {
 	opacity: 1;
-	width: 34px;
-	height: 100%;
+	width: 80px;
 	position: fixed;
-	top: 0;
+	top: 20%;
 	right: 0;
-	padding-top: 85px;
 	color: #555;
-	-webkit-box-shadow: 0 0 7px 0 rgba(119, 119, 119, 0.2);
-	box-shadow: 0 0 7px 0 rgba(119, 119, 119, 0.2);
-	background-color: #fafafa;
-	background: -webkit-linear-gradient(left, #e9e9e9, #fafafa);
-	background: -moz-linear-gradient(left, #e9e9e9, #fafafa);
-	background: -o-linear-gradient(left, #e9e9e9, #fafafa);
-	background: -ms-linear-gradient(left, #e9e9e9, #fafafa);
-	background: linear-gradient(left, #e9e9e9, #fafafa);
-	border-left: 1px solid #d9d9d9;
 	zoom: 1;
 	z-index: 2;
-	background: -o-linear-gradient(left, #e9e9e9, #fafafa);
+	background-color: #969595;
 }
-
 .rbar a:hover {
 	color: #fff;
 }
@@ -32,29 +20,29 @@
 }
 
 .rbar .item-wrap {
+	padding-top: 15px;
 	position: relative;
 	cursor: pointer;
 	text-align: center;
 	font-family: "Microsoft YaHei", SimHei, "WenQuanYi Micro Hei", STHeiti;
-	border-bottom: 1px solid #f9f9f9;
 	-webkit-transition: all 0.15s ease-in-out;
 	-moz-transition: all 0.15s ease-in-out;
 	transition: all 0.15s ease-in-out;
 }
 
 .rbar .item-inner {
-	border-bottom: 1px solid #e3e3e3;
-	width: 34px;
+	border-bottom: 1px solid #ffffff;
+	width: 80px;
 	display: block;
+	color: #ffffff;
 }
 
 .rbar .item-wrap:hover {
-	background-color: #56a022;
+	background-color: #6f6f6f;
 	color: #fff;
 }
 
 .rbar .inner-text {
-	width: 20px;
 	padding: 10px 0 5px 0;
 	margin: auto;
 	text-align: center;
@@ -67,7 +55,6 @@
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;
-	background-color: #56a022;
 }
 
 .item-wrap:hover .badge {
@@ -100,7 +87,7 @@
 .item-wrap .tip:after {
 	position: absolute;
 	content: '';
-	top: 30%;
+	top: 20%;
 	right: -10px;
 	width: 0;
 	height: 0;
@@ -111,7 +98,7 @@
 
 .item-wrap:hover .tip {
 	opacity: 1;
-	right: 32px;
+	right: 80px;
 }
 
 .item-wrap .tip>ul {
@@ -133,11 +120,11 @@
 }
 
 .item-wrap .tip>ul>li:hover {
-	background-color: #56a022;
+	background-color: #6f6f6f;
 }
 
 .rbar .bar-bottom {
-	position: absolute;
+	position: relative;
 	bottom: 0;
 	left: 0;
 	border-top: 1px solid #e3e3e3;
@@ -158,7 +145,7 @@
 	<div class="item-wrap" ng-controller="TruckCtrl">
 		<div class="item-inner">
 			<span class="inner-text"> <!-- <i class="fa fa-fw fa-truck fa-2x"></i> -->我的货车
-			</span> <span class="badge" ng-bind="truckCount"></span>
+			</span> (<span class="text-inverse" ng-bind="truckCount"></span>)
 		</div>
 		<div class="tip">
 			<ul class="list-unstyled">
@@ -170,31 +157,31 @@
 	<div class="bar-center" ng-controller="TodoCtrl">
 		<div class="item-wrap">
 			<a class="item-inner" ui-sref="sale.inquiry"> <span
-				class="inner-text">待报价</span> <span class="badge"
-				ng-bind="todo.inquiry"></span>
+				class="inner-text">待报价</span> (<span class="text-inverse"
+				ng-bind="todo.inquiry"></span>
 			</a>
 			<div class="tip" style="display: none;">报价</div>
 		</div>
 		<div class="item-wrap">
 			<a class="item-inner" ui-sref="sale.order"> <span
-				class="inner-text">待回复</span> <span class="badge"
-				ng-bind="todo.order"></span>
+				class="inner-text">待回复</span> (<span class="text-inverse"
+				ng-bind="todo.order"></span>
 			</a>
 		</div>
 		<div class="item-wrap">
 			<a class="item-inner" ui-sref="sale.change"> <span
-				class="inner-text">变更中</span> <span class="badge"
-				ng-bind="todo.orderChange"></span>
+				class="inner-text">变更中</span> (<span class="text-inverse"
+				ng-bind="todo.orderChange"></span>
 			</a>
 		</div>
 		<div class="item-wrap">
 			<a class="item-inner" ui-sref="sale.notice"> <span
-				class="inner-text">待发货</span> <span class="badge"
-				ng-bind="todo.notice"></span>
+				class="inner-text">待发货</span> (<span class="text-inverse"
+				ng-bind="todo.notice"></span>
 			</a>
 		</div>
 	</div>
-	<div class="bar-bottom">
+	<!-- <div class="bar-bottom">
 		<div class="item-wrap">
 			<div class="item-inner">
 				<span class="inner-text"><i
@@ -206,6 +193,6 @@
 				<span class="inner-text"><i class="fa fa-fw fa-tablet fa-lg"></i></span>
 			</div>
 		</div>
-	</div>
+	</div>  -->
 </div>
 <!-- right static-bar End -->