Merge branch 'educoder' into dev_aliyun

app/views/competitions/_header.html.erb

@@ -1,7 +1,7 @@
 <div id="competition-header" class="clearfix">
-  <a href="/" style="margin: 10px 0; display: inline-block;">
+  <a href="/" style="margin: 10px 0; display: inline-block; margin-left: 25px;">
     <img alt="高校智能化教学与实训平台" class="logoimg" 
-          src="/images/educoder/headNavLogo.png?1526520218" style="margin-top:6px">
+          src="/images/educoder/headNavLogo.png?1526520218" style="margin-top:3px">
   </a>
   <div class="inline fr">
     <ul class="nav-game fl">

public/stylesheets/educoder/edu-all.css

@@ -4,9 +4,9 @@
     /*position: fixed;*/
     top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);}
 .newHeader .logoimg{
-    margin-top: 16px;
+    margin-top: 13px;
     float: left;
-    width: 97px;
+    width: 36px;
 }
 .head-nav{float: left;width: 800px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
 .head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;}
@@ -612,13 +612,13 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 #competition-content img,#competition-db-content img,#ccfPage img{vertical-align: bottom;}
 #hnpage1{background: url('/images/educoder/competition/logo_1.jpg') no-repeat top center;min-height: 820px;}
 
-#competition-header{background:#24292D;height: 60px;width: 100%;padding-right: 40px;box-sizing: border-box;
+#competition-header{background:#24292D;height: 60px;width: 100%;padding-right: 25px;box-sizing: border-box;
     /*position: fixed;*/
     top: 0px;left: 0px;width: 100%;z-index: 1000;}
 #competition-header .logoimg{
     margin-top: 5px;
     float: left;
-    width: 97px;}
+    width: 36px;}
 
 .nav-game{position: relative;}
 .nav-game li{position: relative;float: left;width: 110px;height: 60px;line-height: 60px;text-align: center;box-sizing: border-box}