diff --git a/app/views/competitions/_qg_competition.html.erb b/app/views/competitions/_qg_competition.html.erb index b445b8a3..0668d62e 100644 --- a/app/views/competitions/_qg_competition.html.erb +++ b/app/views/competitions/_qg_competition.html.erb @@ -1,3 +1,4 @@ +<% if false %>
@@ -69,4 +70,6 @@ var h=parseInt($(".top-com").height())+385; $(".qg-2").css({"minHeight":h+"px"}); }) - \ No newline at end of file + +<% end %> +<%= render :partial => 'competitions/qg_second_competition' %> \ No newline at end of file diff --git a/app/views/competitions/_qg_second_competition.html.erb b/app/views/competitions/_qg_second_competition.html.erb new file mode 100644 index 00000000..da4aa51f --- /dev/null +++ b/app/views/competitions/_qg_second_competition.html.erb @@ -0,0 +1,65 @@ +

+

+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+

+

+

\ No newline at end of file diff --git a/public/images/educoder/competition/qg/qg_two_1.png b/public/images/educoder/competition/qg/qg_two_1.png new file mode 100644 index 00000000..a8dab761 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_two_1.png differ diff --git a/public/images/educoder/competition/qg/qg_two_2.png b/public/images/educoder/competition/qg/qg_two_2.png new file mode 100644 index 00000000..fe7daae9 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_two_2.png differ diff --git a/public/images/educoder/competition/qg/qg_two_3.png b/public/images/educoder/competition/qg/qg_two_3.png new file mode 100644 index 00000000..feea3642 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_two_3.png differ diff --git a/public/images/educoder/competition/qg/qg_two_4.png b/public/images/educoder/competition/qg/qg_two_4.png new file mode 100644 index 00000000..07e6d90d Binary files /dev/null and b/public/images/educoder/competition/qg/qg_two_4.png differ diff --git a/public/images/educoder/competition/qg/qg_two_5.png b/public/images/educoder/competition/qg/qg_two_5.png new file mode 100644 index 00000000..55b68d40 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_two_5.png differ diff --git a/public/images/educoder/competition/qg/qg_two_6.png b/public/images/educoder/competition/qg/qg_two_6.png new file mode 100644 index 00000000..96507a72 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_two_6.png differ diff --git a/public/images/educoder/competition/qg/qg_two_7.png b/public/images/educoder/competition/qg/qg_two_7.png new file mode 100644 index 00000000..33e65de1 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_two_7.png differ diff --git a/public/images/educoder/competition/qg/qg_two_8.png b/public/images/educoder/competition/qg/qg_two_8.png new file mode 100644 index 00000000..50016195 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_two_8.png differ diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index b946dc24..10dc6200 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -602,7 +602,7 @@ 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: linear-gradient(to right, #29bd8b , #13dc98);height: 60px;width: 100%;padding-right: 40px;box-sizing: border-box;position: fixed;top: 0px;left: 0px;width: 100%;z-index: 1000;} +#competition-header{background:#24292D;height: 60px;width: 100%;padding-right: 40px;box-sizing: border-box;position: fixed;top: 0px;left: 0px;width: 100%;z-index: 1000;} .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} .nav-game li a{color:#fff;font-size: 16px;} @@ -639,6 +639,29 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important; .position-shixun{position: absolute;z-index: 2;bottom: 40px;text-align: center;width: 100%} .ccf-position-shixun .shixun-btn,.position-shixun .shixun-btn,.ccf-position-shixun-2 .shixun-btn{display: block;float: left;width: 160px;text-align:center;letter-spacing: 1px;height: 40px;line-height: 40px;color:#fff!important;margin:0px 20px;background: linear-gradient(to right, #ff8634 , #ff9d5b);box-shadow: 6px 4px 11px #f7ece4;} +/*第二次竞赛-全国*/ +.second_1{min-height: 832px;} +.second_2{min-height: 446px;} +.second_3{min-height: 595px;padding-top: 190px;box-sizing: border-box;position: relative} +.second_4{min-height: 610px;padding-top: 190px;box-sizing: border-box;position: relative} +.second_5{min-height: 617px;padding-top: 190px;box-sizing: border-box;position: relative} +.second_6{min-height: 1053px;} +.second_7{min-height: 1096px;} +.second_8{min-height: 727px;} +.enter_panel{ + width: 1200px;margin:0px auto;height: 360px;text-align: center; +} +.enter_title{ + color: #0B8298; +} +.enter_btn a{ + float: left;width: 300px;height: 60px;background: #ccc;color: #fff!important;margin:0px 35px;line-height: 60px; + font-size: 22px;font-weight: bold;border-radius: 2px; +} +.enter_btn a.active{ + background: #DAECFC;color: #2BC4C6!important; +} +.enter_btn a.active:hover{background: #2CDAD4;color: #fff!important;} @media screen and (max-width: 1600px) {