Merge branch 'dev' into dev-sxw

添加了后台比赛管理的api
2015-08-22 14:35:08 +08:00
parent 7be0175332 ea3e8841a9
commit 176c91061a
20 changed files with 1009 additions and 78 deletions
--- a/static/src/css/oj.css
+++ b/static/src/css/oj.css
@@ -69,6 +69,22 @@ li.list-group-item {
    padding: 0 0;
 }

-.ac-flag{
+.ac-flag {
    color: green;
+}
+
+.CodeMirror{
+    min-height: 250px;
+    _height:250px;
+    height: auto;
+}
+
+.CodeMirror-scroll {
+  overflow: auto;
+  min-height: 250px;
+  _height:250px;
+  height: auto;
+  position: relative;
+  outline: none;
+
 }