Merge branch 'master' into newmc

diff --git a/css/custom.css b/css/custom.css
index e85a91b279cc552d775231230db017dca8048a25..2d405768bc24607a6806b2d84a441301a89610dc 100644 (file)
--- 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 592f8681bb41b9666d743785496f5f7f8c247660..d83bfc672aee34300f6dc9796fdc0603daa7062c 100644 (file)
--- 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 a5932853eb13a5e8573478ca6ae6cd0b36feefe0..fe829d65c822897e23fc3d727d1ab93477defe1c 100644 (file)
--- 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 c02e7dd3f023cbdbd84c402f36cc0d85cabbcd06..2ccbeb50d8e216211e656d9b0046a0e469ee5d84 100644 (file)
--- 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 c843aa22056d4e640de7397891f90e3efeff486c..f94c1ba623a456ee07f7a5d4069b215bb5241558 100644 (file)
--- a/tmpl/us_entry.en
+++ b/tmpl/us_entry.en
@@ -11,11 +11,11 @@
 
 <h1>Solved problems</h1>
 Total <strong id="solved_count">1</strong>
-<ul class="inline" id="solved"><li><a href="/pb/id">problem_id</a></ul>
+<ul class="list-inline" id="solved"><li><a href="/pb/id">problem_id</a></ul>
 
 <h1>Attempted problems</h1>
 Total <strong id="attempted_count">1</strong>
-<ul class="inline" id="attempted"><li><a href="/pb/id">problem_id</a></ul>
+<ul class="list-inline" id="attempted"><li><a href="/pb/id">problem_id</a></ul>
 
 <h1>Contest results</h1>
 <table class="table table-striped">