[合并-dev]并修复冲突 contest/views.py

2015-08-24 18:44:36 +08:00
parent 2ed22c3bce f648b78c95
commit 581bc61c96
24 changed files with 566 additions and 61 deletions
--- a/static/src/css/oj.css
+++ b/static/src/css/oj.css
@@ -87,4 +87,8 @@ li.list-group-item {
  position: relative;
  outline: none;

+}
+
+.contest-tab{
+    margin-bottom: 5px;
 }