版本库样式冲突

app/views/games/_game_show.html.erb

@@ -45,57 +45,3 @@
     <%= render :partial => 'exec_results' %>
   </div>
 </div>
-
-<script type="text/javascript" language="javascript">
-    var web_h = window.innerHeight;
-    $(document).ready(function(){
-        if($.browser.msie) {
-            $(".content").css("height", web_h - 75 + "px");
-            $(".tab-info-inner").css("height", web_h * 0.55 + "px"); //IE
-            $(".content-editor").css("height", web_h * 0.55 + 100 + "px");
-        }
-        else if($.browser.safari)
-        {
-            $(".content").css("height", web_h - 75 + "px");
-            $(".tab-info-inner").css("height", web_h * 0.55 + "px"); //Safari
-            $(".content-editor").css("height", web_h * 0.55 + 105 + "px");
-        }
-        else if($.browser.mozilla)
-        {
-            $(".content").css("height", web_h - 75 + "px");
-            $(".tab-info-inner").css("height", web_h * 0.48 + 50 + "px");  //Firefox
-            $(".content-editor").css("height", web_h * 0.48 + 155 + "px");
-        }
-        else if($.browser.opera) {
-            $(".content").css("height", web_h - 75 + "px");
-            $(".tab-info-inner").css("height", web_h * 0.55 + "px");     //Opera
-            $(".content-editor").css("height", web_h * 0.55 + 105 + "px");
-        }else if($.browser.chrome){
-            if(window.navigator.userAgent.indexOf("MetaSr") == -1){
-                $(".content").css("height", web_h - 75 + "px");
-                $(".tab-info-inner").css("height", web_h * 0.55 + "px");
-                $(".content-editor").css("height", web_h * 0.55 + 105 + "px");
-            }else{
-                $(".content").css("height", web_h - 75 + "px");
-                $(".tab-info-inner").css("height", web_h * 0.52 + "px");
-                $(".content-editor").css("height", web_h * 0.52 + 105 + "px");
-            }
-        }
-    });
-    //课程大纲tab
-    function g(o){return document.getElementById(o);}
-    function HoverLi(n){
-        for(var i=1;i<=3;i++){
-            g('tab_nav_'+i).className='tab_nomal';
-            g('tab_con_'+i).className='undis';
-        }
-        g('tab_con_'+n).className='dis';
-        g('tab_nav_'+n).className='tab_hover';
-    }
-    $("#close_myshixun_tip").click(function(){
-        $("#myshixun_tip").hide();
-    });
-    function extend_game_description(){
-        $(".content-all-fix").show();
-    }
-</script>

app/views/games/_repository.html.erb

@@ -1,5 +1,5 @@
-<div class=" col-width fl ml15 mt15 content-half-fix02 undis">
+<div class="col-width fl ml15 mt15 content-half-fix02 undis" style="border: none">
-  <div class="panel-header clearfix">
+  <div class="panel-header clearfix" style="border: none">
     <h3 class="fl">测试输出</h3>
     <div class="fr  mt5">
       <a href="#"><i class="fa fa-minus font-14 mr10 fl color-grey"></i></a>
@@ -11,8 +11,8 @@
     Engryg=74
   </div>
 </div>
-<div class="content-editor col-width fl">
+<div class="content-editor col-width2 fl">
-  <div class="panel-header clearfix">
+  <div class="panel-header2 clearfix">
     <h3 class="fl">
       <%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
     </h3>

app/views/games/show.html.erb

@@ -1,3 +1,58 @@
 <div id="content_list">
   <%= render :partial => "game_show" %>
 </div>
+
+
+<script type="text/javascript" language="javascript">
+    var web_h = window.innerHeight;
+    $(document).ready(function(){
+        if($.browser.msie) {
+            $(".content").css("height", web_h - 75 + "px");
+            $(".tab-info-inner").css("height", web_h * 0.55 + "px"); //IE
+            $(".content-editor").css("height", web_h * 0.55 + 100 + "px");
+        }
+        else if($.browser.safari)
+        {
+            $(".content").css("height", web_h - 75 + "px");
+            $(".tab-info-inner").css("height", web_h * 0.55 + "px"); //Safari
+            $(".content-editor").css("height", web_h * 0.55 + 105 + "px");
+        }
+        else if($.browser.mozilla)
+        {
+            $(".content").css("height", web_h - 75 + "px");
+            $(".tab-info-inner").css("height", web_h * 0.48 + 50 + "px");  //Firefox
+            $(".content-editor").css("height", web_h * 0.48 + 155 + "px");
+        }
+        else if($.browser.opera) {
+            $(".content").css("height", web_h - 75 + "px");
+            $(".tab-info-inner").css("height", web_h * 0.55 + "px");     //Opera
+            $(".content-editor").css("height", web_h * 0.55 + 105 + "px");
+        }else if($.browser.chrome){
+            if(window.navigator.userAgent.indexOf("MetaSr") == -1){
+                $(".content").css("height", web_h - 75 + "px");
+                $(".tab-info-inner").css("height", web_h * 0.55 + "px");
+                $(".content-editor").css("height", web_h * 0.55 + 105 + "px");
+            }else{
+                $(".content").css("height", web_h - 75 + "px");
+                $(".tab-info-inner").css("height", web_h * 0.52 + "px");
+                $(".content-editor").css("height", web_h * 0.52 + 105 + "px");
+            }
+        }
+    });
+    //课程大纲tab
+    function g(o){return document.getElementById(o);}
+    function HoverLi(n){
+        for(var i=1;i<=3;i++){
+            g('tab_nav_'+i).className='tab_nomal';
+            g('tab_con_'+i).className='undis';
+        }
+        g('tab_con_'+n).className='dis';
+        g('tab_nav_'+n).className='tab_hover';
+    }
+    $("#close_myshixun_tip").click(function(){
+        $("#myshixun_tip").hide();
+    });
+    function extend_game_description(){
+        $(".content-all-fix").show();
+    }
+</script>

public/stylesheets/css/taskstyle.css

@@ -39,6 +39,7 @@ a.link-color-green{color:#29bd8b;}
 .pr5{ padding-right:5px;}.pr10{ padding-right:10px;}.pr15{ padding-right:15px;}.pr20{ padding-right:20px;}
 /*块*/
 .col-width{background: #fff; border:1px solid #e8e8e8;}
+.col-width2{background: #fff;}
 .col-width-10{ max-width: 100%; background: #fff; border:1px solid #e8e8e8;}
 .col-width-9{ max-width: 90%; background: #fff; border:1px solid #e8e8e8;}
 .col-width-8{ max-width: 80%; background: #fff; border:1px solid #e8e8e8;}
@@ -101,6 +102,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:245px; margin-top
 .content-info{ width:49%; min-width:450px;}
 .content-editor{  width:49%; min-width:450px; margin-left:15px; }
 .panel-header{  border-bottom:1px solid #eee; padding:10px 15px;}
+.panel-header2{padding:10px 15px;}
 /* tab */
 .tab_content{ width: 100%;  margin: 0 auto;  background:#fff;  }
 #tab_nav {height:40px;background: #eff0f4; }