Merge branch 'webapp' of git.dev.sh.ctripcorp.com:wxd-pd/wxd-uitool i…

…nto webapp * 'webapp' of git.dev.sh.ctripcorp.com:wxd-pd/wxd-uitool: WA样式：面板开关图标改为箭头
protoshop · Mar 10, 2014 · 237f9a3 · 237f9a3
2 parents 8486453 + cdd3eb4
commit 237f9a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/styles/main.css b/app/styles/main.css
@@ -34,9 +34,9 @@ i { font-style: normal; }
 .layout-stage { -webkit-flex: 1; flex: 1; margin-top: 50px; background-color: rgba(0,0,0,0.2); background-position: center center; background-repeat: no-repeat; overflow: auto; }
 .i5 { background-image: url(../images/bg-stage-i5.png); background-size: 521px auto; }
 .s4 { background-image: url(../images/bg-stage-s4.png); }
-.icon-menu { position: fixed; top: 50%; -webkit-transform: translate(0,-50%); padding: 8px 5px; background: rgba(0,0,0,0.4); color: #fff; }
-.layout-scenes .icon-menu { left: 180px; border-radius: 0 3px 3px 0; }
-.layout-tools .icon-menu { right: 300px; border-radius: 3px 0 0 3px; }
+.panel-toggle { position: fixed; top: 50%; -webkit-transform: translate(0,-50%); padding: 8px 5px; background: rgba(0,0,0,0.4); color: #fff; }
+.layout-scenes .panel-toggle { left: 180px; border-radius: 0 3px 3px 0; }
+.layout-tools .panel-toggle { right: 300px; border-radius: 3px 0 0 3px; }
 
 /* Scenes ( layout - left sidebar ) */
 .scenes-list { padding: 0; }

diff --git a/app/templates/package-edit.html b/app/templates/package-edit.html
@@ -19,7 +19,7 @@
 	<notify />
 	<!-- 左栏：场景列表 -->
 	<div class="layout-scenes" ng-click="deselectScene()">
-		<button class="icon-menu"></button>
+		<button class="panel-toggle icon-left-open-big"></button>
 		<div class="scenes-title" ng-bind="package.appName"></div>
 		<ul class="scenes-list">
 			<li class="scene-item" ng-repeat="scene in package.scenes | orderBy:'order':number"
@@ -46,7 +46,7 @@
 
 	<!-- 右栏：场景修改工具区 -->
 	<div class="layout-tools">
-		<button class="icon-menu"></button>
+		<button class="panel-toggle icon-right-open-big"></button>
 		<!-- tools: background -->
 		<div class="tools-box" ng-show="editStat.selectedScene !== null">
 			<div class="tools-title">Background</div>