Merge branch 'develop' into dev_aliyun

app/views/competitions/_gq_second_code_competition.html.erb

@@ -120,7 +120,11 @@
               <p class="challenge_b_d">项目简介</p>
               <p class="break-word challenge_b_des"><%= raw row_data[:description] %></p>
               <p class="challenge_b_d">标注任务</p>
-              <p class="break-word challenge_b_des" style="color: #FC2F78;min-height: 60px"><%= row_data[:task] %></p>
+              <% if index ==2 %>
+                <p class="break-word challenge_b_des" style="color: #FC2F78;min-height: 60px"><%= row_data[:task] %></p>
+              <% else %>
+                <p class="break-word challenge_b_des" style="color: #FC2F78;min-height: 80px"><%= row_data[:task] %></p>
+              <% end %>
               <p class="challenge_b_d">经典算法解读：</p>
               <ul class="clearfix algorithm">
                 <a href="<%= row_data[:link_url] %>" target="_blank"><%= row_data[:link_name] %></a>

public/stylesheets/educoder/edu-all.css

@@ -712,7 +712,7 @@ li.challenge_box{
     color: #0B8298;font-size: 20px;line-height: 20px;text-align: left;font-weight: bold;margin-bottom: 40px;padding-left: 3px;
 }
 .challenge_b_des{
-    line-height: 20px;color: #0B8298;font-size: 18px;text-align: left;text-align:justify;margin-bottom: 40px;min-height: 220px;
+    line-height: 20px;color: #0B8298;font-size: 18px;text-align: left;text-align:justify;margin-bottom: 30px;min-height: 240px;
 }
 li.challenge_box:last-child{
     margin-right: 0px;