diff --git a/Gemfile b/Gemfile index 3e159036..7acfb39f 100644 --- a/Gemfile +++ b/Gemfile @@ -64,11 +64,11 @@ gem 'elasticsearch-rails' gem 'oauth2' # xlsx -gem 'axlsx', '3.0.0.pre' -gem 'axlsx_rails', '0.3.0' +# gem 'axlsx', '3.0.0.pre' +# gem 'axlsx_rails', '0.3.0' # state machine -gem 'aasm' +# gem 'aasm' #Ruby 2.2+ has removed test/unit from the core library. if RUBY_VERSION>='2.2' diff --git a/app/views/competitions/_qg_second_course_competition.html.erb b/app/views/competitions/_qg_second_course_competition.html.erb new file mode 100644 index 00000000..92d2a9f9 --- /dev/null +++ b/app/views/competitions/_qg_second_course_competition.html.erb @@ -0,0 +1,14 @@ +
+ + + + + diff --git a/public/images/educoder/competition/qg/qg_teach_1.png b/public/images/educoder/competition/qg/qg_teach_1.png new file mode 100644 index 00000000..37c55e67 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_teach_1.png differ diff --git a/public/images/educoder/competition/qg/qg_teach_2.png b/public/images/educoder/competition/qg/qg_teach_2.png new file mode 100644 index 00000000..b23863e1 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_teach_2.png differ diff --git a/public/images/educoder/competition/qg/qg_teach_3.png b/public/images/educoder/competition/qg/qg_teach_3.png new file mode 100644 index 00000000..94458a85 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_teach_3.png differ diff --git a/public/images/educoder/competition/qg/qg_teach_4.png b/public/images/educoder/competition/qg/qg_teach_4.png new file mode 100644 index 00000000..d4efd6a0 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_teach_4.png differ diff --git a/public/images/educoder/competition/qg/qg_teach_5.png b/public/images/educoder/competition/qg/qg_teach_5.png new file mode 100644 index 00000000..0a7c2600 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_teach_5.png differ diff --git a/public/images/educoder/competition/qg/qg_teach_6.png b/public/images/educoder/competition/qg/qg_teach_6.png new file mode 100644 index 00000000..49e689b9 Binary files /dev/null and b/public/images/educoder/competition/qg/qg_teach_6.png differ diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 0721252f..18160d0b 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -649,7 +649,7 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important; .second_7{min-height: 1096px;} .second_8{min-height: 727px;} - +/*代码标注*/ .second_code_1{min-height: 791px;} .second_code_2{min-height: 436px;} .second_code_3{min-height: 1460px;padding-top: 190px;box-sizing: border-box;position: relative} @@ -677,6 +677,7 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important; .enter_btn a.active{ background: #DAECFC;color: #2BC4C6!important; } + .setNewBnt{width: 100%!important;margin:0px!important;} .enter_btn a.active:hover{background: #2CDAD4;color: #fff!important;} .challenge_describe{ @@ -704,6 +705,29 @@ li.challenge_box:last-child{ +/*实践教学*/ +.second_course_1{min-height: 782px;} +.second_course_2{min-height: 823px;} +.second_course_3{min-height: 690px;} +.second_course_4{min-height: 523px;} +.second_course_5{min-height: 737px;padding-top: 190px;box-sizing: border-box;position: relative} +.second_course_6{min-height: 1230px;} +.course_competition_panel{ + margin:30px 40px 40px;border:1px solid #ABDCF1;background: #F1F8FD;justify-content: center;align-items: center;display: -webkit-flex; + height: 282px;text-align: center; +} +.course_competition_panel a{ + width: 320px;height: 60px;line-height: 60px;float: left;margin:0px 100px;background: #ccc;color: #fff!important; + text-align: center;font-size: 22px; +} +.course_competition_panel a.active{ + background: #47B6FC; +} +.ex_submit{ + width: 360px;height: 70px;background: #2CDAD4;color: #fff!important;font-size: 30px;line-height: 70px;text-align: center; + margin:0px auto;display: block; +} +