Merge branch 'dev' into dev-sxw

dev -> dev-sxw O
2015-09-10 09:30:14 +08:00
parent da8aca443c 60f911e421
commit 70d3fcf323
5 changed files with 86 additions and 14 deletions
--- a/static/src/css/oj.css
+++ b/static/src/css/oj.css
@@ -95,4 +95,12 @@ li.list-group-item {

 .contest-tab{
    margin-bottom: 15px;
+}
+
+#share-code{
+    margin-top: 15px;
+}
+
+#share-code textarea {
+    margin-top: 15px;
 }