diff --git a/Gemfile b/Gemfile index d89f9a24..3e159036 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'https://gems.ruby-china.com' +source 'http://gems.ruby-china.com' unless RUBY_PLATFORM =~ /w32/ # unix-like only @@ -57,7 +57,7 @@ gem 'chinese_pinyin' gem 'ansi' gem 'diff-lcs', '~> 1.3' -gem 'kaminari' +# gem 'kaminari' gem 'elasticsearch-model' gem 'elasticsearch-rails' diff --git a/app/views/competitions/enroll.html.erb b/app/views/competitions/enroll.html.erb index ab6d5b16..8bd519e3 100644 --- a/app/views/competitions/enroll.html.erb +++ b/app/views/competitions/enroll.html.erb @@ -1,8 +1,10 @@
-
+
+

<%= @competition.name %>

<% if @minimum_staff > 1 %> -

+

<%= @competition.sub_title %>

+

<% unless User.current.logged? %> <%= link_to "创建战队", signin_path, :remote => true, :class => "enroll-in-b enroll-in-b-green fr" %> <% else %> @@ -16,8 +18,7 @@ 创建战队 <% end %> <% end %> -

-

+ <% unless User.current.logged? %> <%= link_to "加入战队", signin_path, :remote => true, :class => "enroll-in-b fr" %> <% else %> @@ -35,8 +36,9 @@ <% else %> <% unless User.current.logged? %> - <%= link_to "立即报名", signin_path, :remote => true, :class => "enroll-in-b enroll-in-b-green fr" %> +

<%= link_to "立即报名", signin_path, :remote => true, :class => "enroll-in-b fr" %>

<% else %> +

<% unless @competition.enroll_end_time.present? && @competition.enroll_end_time < Time.now %> <% if @is_enroll.present? %> 立即报名 @@ -46,6 +48,7 @@ <% else %> 立即报名 <% end %> +

<% end %> <% end %>
diff --git a/public/images/educoder/competition/anon.jpg b/public/images/educoder/competition/anon-old.jpg similarity index 100% rename from public/images/educoder/competition/anon.jpg rename to public/images/educoder/competition/anon-old.jpg diff --git a/public/images/educoder/competition/anon.png b/public/images/educoder/competition/anon.png new file mode 100644 index 00000000..86cfb818 Binary files /dev/null and b/public/images/educoder/competition/anon.png differ diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 6af5abec..dd1feea4 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -748,7 +748,31 @@ li.challenge_box:last-child{ .enrollItemContent{padding: 0px 10px;width: 100%;box-sizing: border-box;height: 100%;overflow: hidden;} .enrollItemContent li{border-bottom: 1px solid #EAEAEA;padding: 20px;line-height: 20px} .team-p-s{width: 20px;height: 20px;line-height: 12px;text-align: center;border-radius: 50%;background: #BCBCBC;color: #fff;float: left} -.enroll-in-b{display: block;border:4px solid #fff;width: 216px;height: 62px;text-align: center;line-height: 62px;margin-right: 220px;font-size: 32px;color: #fff!important;background: #006542} +.enroll-in-b{display: block;border:4px solid #fff;width: 216px;height: 62px;text-align: center;line-height: 62px;margin: 0px 20px;font-size: 32px;color: #fff!important;background: #4CACFF} +.main_title{ + font-size: 50px; + font-family:MicrosoftYaHei-Bold; + font-weight:bold; + color:rgba(59,161,250,1); + line-height: 60px; + margin-bottom: 20px; + -webkit-text-stroke:4px undefined; + text-stroke:4px undefined; + text-shadow: 0 0 0.2em #fff, 0 0 0.2em #fff, 0 0 0.2em #fff; + -webkit-text-stroke: 1px white; + -webkit-text-fill-color:12px black; + +} +.sub_title{ + font-size: 40px; + font-family:MicrosoftYaHei-Bold; + font-weight:bold; + color:rgba(255,255,255,1); + line-height:17px; + text-shadow:0px 9px 8px rgba(19,12,55,0.79); + margin-bottom: 20px; + letter-spacing: 10px; +} .enroll-in-b-green{background: #29BD8B} .joinTeamInfo{background-image:url('/images/educoder/competition/enroll-item.png');height:202px;width: 934px;padding: 10px 35px;box-sizing: border-box;margin: 0px auto;padding-top: 60px;}