Merge branch 'dxy' into test

application/index/view/main_index/main_index.html

@@ -3,15 +3,11 @@
 <input type="hidden" class="page-load" id="mainIndex" />
 <style>
 	/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/  
-
 	html{
    		font-size:640%;
-   		/*overflow:hidden !important;*/
+   		overflow:scroll !important;
    		padding: 0 15px;
    	}
-   	body {
-   		overflow: hidden;;
-   	}
 	.container{
 	    width: 100%;
 	    height:100%;
@@ -28,8 +24,9 @@
 	}
 	#mainFrameTabs {
 		padding-left:1%;
-		width:86%;
+		width:87%;
 		overflow-y: scroll;
+		background-color: #ffffff;
 	}
 	.nav-tabs {
 		border : none ;
@@ -58,8 +55,6 @@
 		height: 820px!important;
 		overflow-y: auto;
 	}
-	
-	
 	/* 左侧目录标签的滚动条样式 */
 	#mainFrameTabs::-webkit-scrollbar-track{
 	    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3) !important;
@@ -67,7 +62,7 @@
 	}
 	/* 滚动条的滑轨背景颜色 */
 	#mainFrameTabs::-webkit-scrollbar{
-	    width: 4px !important;
+	    width: 0px ;
 	    background-color: #FF2F2F !important;
 	}
 	/* 滑块颜色 */
@@ -88,15 +83,9 @@
 			<div id="page-content-wrapper">
    				 <div class="container">
    				 	<iframe frameborder="0" class="iframe-type" scrolling="yes" style="width:100%;height:100%;border:0px" src="/index/PerformanceRanking">
-   				 		
-   				 		
    				 	</iframe>
    				 </div>
 			</div>
 		</div>	
 	</div>
 </div>
-<!--加载图标-->
-<!--<div id="main_loading_pic">
-		<img src="/resource/image/jz2.gif">
-</div>-->

public/resource/css/public.css

@@ -17,12 +17,12 @@ iframe > html > body {
 	padding:0px;
 }
 /*适配 不同屏幕*/
-@media (min-width:1680px){
+/*@media (min-width:1680px){
   body{
     width:1560px !important;
   };
   
-}
+}*/
 html { 
 	height: 100%;
 	overflow: hidden;
@@ -31,6 +31,12 @@ html {
 a:hover{
     text-decoration:none;
 }
+#headTileNavBar{
+    background: #FF750E !important;
+    width: 100%;
+    height: 40px;
+    margin-bottom: 15px!important;
+}
 .navbar{
     background: #ff9419;
     width: 100%;
@@ -93,7 +99,8 @@ a:hover{
     padding-left: 0;
     /*height: 1300px;*/
     transition: all 0.5s ease;
-    width: 98%!important;
+    /*width: 98%!important;*/
+    display:inline-block
 }
 #wrapper.toggled {
 }
@@ -114,10 +121,12 @@ a:hover{
     overflow-y: auto;
     /*transition: all 0.5s ease;*/
     /*width: 136px;*/
-    width: 13%;
+    width: 10%;
+    min-width : 165px;
     z-index: 1000;
     float: left;
     height: 820px;
+    display:inline
     /*animation: show-mulu-action 1.3s;*/  
      /*目录显示的动画效果（from透明  to 全部显示，用时1.5秒）*/
 }

public/resource/js/mainIndex.js

@@ -16,11 +16,18 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
         	var that = this ; 
           	//只在首页显示 菜单
           	var height1 = $("html").height();
-          	var height = $("html").height() -120+ "px !important" ;
-//        	$('.tab-content').attr("style","height:"+height);
+          	var height = $("html").height() -80+ "px !important" ;
           	
-$('#mainFrameTabs').attr("style","height:"+height);
-
+			$('#mainFrameTabs').attr("style","height:"+height);
+			$('#sidebar-wrapper').attr("style","height:"+height);
+			
+			var sceenWidth = window.screen.width < 1200 ? 1200 : window.screen.width ; 
+			var width = sceenWidth - $('#sidebar-wrapper').width() + "px !important";
+			var sceen = sceenWidth+ "px !important";
+			
+			$('#mainFrameTabs').attr("style","min-width:959px !important");
+			$('#wrapper').attr("style","min-width:"+sceen );
+			$('#headTileNavBar').attr("style","min-width:"+sceen);
           	menu_bar(function(){
 		    	//回调部分
 		    	//记录tab的点击状态，对应的标签内容展开，并高亮显示