From: Marius Gavrilescu Date: Mon, 20 Apr 2015 14:27:46 +0000 (+0300) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=a9159cae5cd97f3f2d52de2b7c64decd44534f77;hp=260a6894d9fdfe3cd2f05cd1926b77b46119dc01;p=gruntmaster-page.git Merge branch 'master' into newmc --- diff --git a/css/custom.css b/css/custom.css index e85a91b..2d40576 100644 --- a/css/custom.css +++ b/css/custom.css @@ -15,7 +15,7 @@ div.container-fluid { padding: 0 15px; } -.list-group-item, .form-control { +.form-control { max-width: 30em; } @@ -23,34 +23,10 @@ div#result{ text-align: center; } -a.dropdown-toggle{ - cursor: pointer; -} - .table-fixed{ table-layout: fixed; } -nav li{ - padding: 5px; -} - -ul.inline{ - list-style-type: none; -} - -ul.inline li{ - display: inline; -} - -ul.inline li:after { - content: ", "; -} - -ul.inline li:last-child:after { - content: ""; -} - .tracker-mark.tick { color: green; } diff --git a/css/hl.css b/css/hl.css index 592f868..d83bfc6 100644 --- a/css/hl.css +++ b/css/hl.css @@ -1,39 +1,6 @@ /* Style definition file generated by highlight 3.9, http://www.andre-simon.de/ */ - /* Highlighting theme: Emacs Editor */ -body.perl-hl { background-color:#ffffff; } -pre.perl-hl { color:#000000; background-color:#ffffff; font-size:10pt; font-family:'Courier New';} -.perl-hl.num { color:#000000; } -.perl-hl.esc { color:#bd8d8b; } -.perl-hl.str { color:#bd8d8b; } -.perl-hl.pps { color:#bd8d8b; } -.perl-hl.slc { color:#ac2020; font-style:italic; } -.perl-hl.com { color:#ac2020; font-style:italic; } -.perl-hl.ppc { color:#000000; } -.perl-hl.opt { color:#000000; } -.perl-hl.lin { color:#555555; } -.perl-hl.kwa { color:#9c20ee; font-weight:bold; } -.perl-hl.kwb { color:#208920; } -.perl-hl.kwc { color:#0000ff; } -.perl-hl.kwd { color:#000000; } - -body.cpp-hl { background-color:#ffffff; } -pre.cpp-hl { color:#000000; background-color:#ffffff; font-size:10pt; font-family:'Courier New';} -.cpp-hl.num { color:#000000; } -.cpp-hl.esc { color:#bd8d8b; } -.cpp-hl.str { color:#bd8d8b; } -.cpp-hl.pps { color:#bd8d8b; } -.cpp-hl.slc { color:#ac2020; font-style:italic; } -.cpp-hl.com { color:#ac2020; font-style:italic; } -.cpp-hl.ppc { color:#000000; } -.cpp-hl.opt { color:#000000; } -.cpp-hl.lin { color:#555555; } -.cpp-hl.kwa { color:#9c20ee; font-weight:bold; } -.cpp-hl.kwb { color:#208920; } -.cpp-hl.kwc { color:#0000ff; } -.cpp-hl.kwd { color:#000000; } - body.hl { background-color:#ffffff; } pre.hl { color:#000000; background-color:#ffffff; font-size:10pt; font-family:'Courier New';} .hl.num { color:#000000; } diff --git a/css/themes/cyborg.css b/css/themes/cyborg.css index a593285..fe829d6 100644 --- a/css/themes/cyborg.css +++ b/css/themes/cyborg.css @@ -1426,42 +1426,6 @@ fieldset[disabled] .btn-primary.active { .text-info:hover { color: #9933cc; } -.has-warning .help-block, -.has-warning .control-label, -.has-warning .form-control-feedback { - color: #ff8800; -} -.has-warning .form-control, -.has-warning .form-control:focus, -.has-warning .input-group-addon { - border-color: #ff8800; -} -.has-error .help-block, -.has-error .control-label, -.has-error .form-control-feedback { - color: #cc0000; -} -.has-error .form-control, -.has-error .form-control:focus, -.has-error .input-group-addon { - border-color: #cc0000; -} -.has-success .help-block, -.has-success .control-label, -.has-success .form-control-feedback { - color: #77b300; -} -.has-success .form-control, -.has-success .form-control:focus, -.has-success .input-group-addon { - border-color: #77b300; -} -legend { - color: #fff; -} -.input-group-addon { - background-color: #424242; -} .nav-tabs a, .nav-pills a, .breadcrumb a, @@ -1476,52 +1440,8 @@ legend { .alert .close { text-decoration: none; } -.close { - color: #fff; - text-decoration: none; - opacity: 0.4; -} -.close:hover, -.close:focus { - color: #fff; - opacity: 1; -} a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active { border-color: #282828; } -a.list-group-item.active, -a.list-group-item.active:hover, -a.list-group-item.active:focus { - border-color: #282828; -} -a.list-group-item-success.active { - background-color: #77b300; -} -a.list-group-item-success.active:hover, -a.list-group-item-success.active:focus { - background-color: #669a00; -} -a.list-group-item-warning.active { - background-color: #ff8800; -} -a.list-group-item-warning.active:hover, -a.list-group-item-warning.active:focus { - background-color: #e67a00; -} -a.list-group-item-danger.active { - background-color: #cc0000; -} -a.list-group-item-danger.active:hover, -a.list-group-item-danger.active:focus { - background-color: #b30000; -} -.jumbotron h1, -.jumbotron h2, -.jumbotron h3, -.jumbotron h4, -.jumbotron h5, -.jumbotron h6 { - color: #fff; -} diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm index c02e7dd..2ccbeb5 100644 --- a/lib/Plack/App/Gruntmaster.pm +++ b/lib/Plack/App/Gruntmaster.pm @@ -21,21 +21,6 @@ no warnings 'illegalproto'; use constant USER_REGEX => qr/^\w{2,20}$/a; -use constant CONTENT_TYPES => +{ - c => 'text/x-csrc', - cpp => 'text/x-c++src', - cs => 'text/x-csharp', # Used by GNOME. Not in mime.types. - go => 'text/plain', # ? - gs => 'text/plain', - hs => 'text/x-haskell', - java => 'text/x-java', - pas => 'text/x-pascal', - pl => 'text/x-perl', - py => 'text/x-python', - rb => 'application/x-ruby', - l => 'text/plain', -}; - use constant FORMAT_EXTENSION => { C => 'c', CPP => 'cpp', @@ -103,7 +88,7 @@ sub dispatch_request{ my $private = job->private || job->problem->private || job->contest && job->contest->is_running; forbid !$isowner && $private; my $privacy = $private ? 'private' : 'public'; - my @headers = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=604800", 'Content-Type' => CONTENT_TYPES->{job->extension}); + my @headers = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=604800", 'Content-Type' => 'text/plain'); push @headers, (Vary => 'Authorization') if $private; [200, \@headers, [job->source]] }, diff --git a/tmpl/us_entry.en b/tmpl/us_entry.en index c843aa2..f94c1ba 100644 --- a/tmpl/us_entry.en +++ b/tmpl/us_entry.en @@ -11,11 +11,11 @@

Solved problems

Total 1 - +

Attempted problems

Total 1 - +

Contest results