From: Marius Gavrilescu Date: Fri, 28 Feb 2014 10:10:51 +0000 (+0200) Subject: Merge branch 'master' into mindcoding X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=fd7ea993642eacb1f0a6beb2a2a8464fcf8480c4;p=plack-app-gruntmaster.git Merge branch 'master' into mindcoding Conflicts: css/custom.css lib/Gruntmaster/Page/St.pm tmpl/log.en --- fd7ea993642eacb1f0a6beb2a2a8464fcf8480c4 diff --cc css/custom.css index 9bc0cbd,9872ee8..1e5d955 --- a/css/custom.css +++ b/css/custom.css @@@ -48,6 -52,6 +48,10 @@@ a.dropdown-toggle cursor: pointer; } +#sponsors a.logo{ + margin-bottom: 1em; +} ++ + .table-fixed{ + table-layout: fixed; -} ++} diff --cc lib/Gruntmaster/Page/Pb/Entry.pm index 5dbeb92,f03fe7a..9f3fc6b --- a/lib/Gruntmaster/Page/Pb/Entry.pm +++ b/lib/Gruntmaster/Page/Pb/Entry.pm @@@ -1,13 -1,8 +1,8 @@@ package Gruntmaster::Page::Pb::Entry; - use 5.014000; - use strict; - use warnings; use Gruntmaster::Page::Base pb_entry => ''; - our @ISA = qw/Gruntmaster::Page::Base/; - our $VERSION = '0.001'; -use constant FORMATS => [qw/C CPP JAVA PERL PYTHON/]; +use constant FORMATS => [qw/C CPP JAVA PASCAL PERL PYTHON/]; sub _generate{ my ($self, $htc, $lang, $env, $contest, $id) = @_;