From: Marius Gavrilescu <marius@ieval.ro>
Date: Sun, 19 Apr 2015 19:37:58 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=35fc050c68c786aea19320eafc99e923c523a8f3;hp=b8d36f0686c49a0220cc4c1ef59e47759f7a10f8;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

diff --git a/css/themes/cyborg.css b/css/themes/cyborg.css
index 0437e3f..a593285 100644
--- a/css/themes/cyborg.css
+++ b/css/themes/cyborg.css
@@ -838,8 +838,8 @@ table {
   background-color: #181818;
 }
 caption {
-  padding-top: 8px;
-  padding-bottom: 8px;
+  padding-top: 5px;
+  padding-bottom: 5px;
   color: #888888;
   text-align: left;
 }
@@ -857,7 +857,7 @@ th {
 .table > thead > tr > td,
 .table > tbody > tr > td,
 .table > tfoot > tr > td {
-  padding: 8px;
+  padding: 5px;
   line-height: 1.42857143;
   vertical-align: top;
   border-top: 1px solid #282828;
@@ -880,14 +880,6 @@ th {
 .table .table {
   background-color: #060606;
 }
-.table-condensed > thead > tr > th,
-.table-condensed > tbody > tr > th,
-.table-condensed > tfoot > tr > th,
-.table-condensed > thead > tr > td,
-.table-condensed > tbody > tr > td,
-.table-condensed > tfoot > tr > td {
-  padding: 5px;
-}
 .table-bordered {
   border: 1px solid #282828;
 }
diff --git a/css/themes/readable.css b/css/themes/readable.css
index d4e9b50..7ec6ad5 100644
--- a/css/themes/readable.css
+++ b/css/themes/readable.css
@@ -838,8 +838,8 @@ table {
   background-color: transparent;
 }
 caption {
-  padding-top: 8px;
-  padding-bottom: 8px;
+  padding-top: 5px;
+  padding-bottom: 5px;
   color: #b3b3b3;
   text-align: left;
 }
@@ -857,7 +857,7 @@ th {
 .table > thead > tr > td,
 .table > tbody > tr > td,
 .table > tfoot > tr > td {
-  padding: 8px;
+  padding: 5px;
   line-height: 1.42857143;
   vertical-align: top;
   border-top: 1px solid #dddddd;
@@ -880,14 +880,6 @@ th {
 .table .table {
   background-color: #ffffff;
 }
-.table-condensed > thead > tr > th,
-.table-condensed > tbody > tr > th,
-.table-condensed > tfoot > tr > th,
-.table-condensed > thead > tr > td,
-.table-condensed > tbody > tr > td,
-.table-condensed > tfoot > tr > td {
-  padding: 5px;
-}
 .table-bordered {
   border: 1px solid #dddddd;
 }
diff --git a/css/themes/slate.css b/css/themes/slate.css
index 17380ce..68e9656 100644
--- a/css/themes/slate.css
+++ b/css/themes/slate.css
@@ -838,8 +838,8 @@ table {
   background-color: #2e3338;
 }
 caption {
-  padding-top: 8px;
-  padding-bottom: 8px;
+  padding-top: 5px;
+  padding-bottom: 5px;
   color: #7a8288;
   text-align: left;
 }
@@ -857,7 +857,7 @@ th {
 .table > thead > tr > td,
 .table > tbody > tr > td,
 .table > tfoot > tr > td {
-  padding: 8px;
+  padding: 5px;
   line-height: 1.42857143;
   vertical-align: top;
   border-top: 1px solid #1c1e22;
@@ -880,14 +880,6 @@ th {
 .table .table {
   background-color: #272b30;
 }
-.table-condensed > thead > tr > th,
-.table-condensed > tbody > tr > th,
-.table-condensed > tfoot > tr > th,
-.table-condensed > thead > tr > td,
-.table-condensed > tbody > tr > td,
-.table-condensed > tfoot > tr > td {
-  padding: 5px;
-}
 .table-bordered {
   border: 1px solid #1c1e22;
 }
diff --git a/tmpl/log.en b/tmpl/log.en
index 03bc89d..bbbbcaa 100644
--- a/tmpl/log.en
+++ b/tmpl/log.en
@@ -1,4 +1,4 @@
-<table class="table table-striped table-condensed">
+<table class="table table-striped">
 <thead><tr><th>ID<th class="problem">Problem<th class="contest">Contest<th>Date<th>Source<th class="owner">User<th>Result</thead>
 
 <tbody>