xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj

Browse Source 
Conflicts:
	contest/views.py
修复冲突，修改了不恰当的函数名
This commit is contained in:
sxw@401
2015-09-17 11:33:55 +08:00
parent 3c1d256cc2 25379e1c1d
commit 03e64ad08d
26 changed files with 215 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/src/css/admin.css
View File

@@ -1,4 +1,3 @@
@import url("global.css");
@import url("bootstrap/bootstrap.min.css");
@import url("bootstrap/todc-bootstrap.min.css");
@import url("codeMirror/codemirror.css");
@@ -6,6 +5,7 @@
@import url("webuploader/webuploader.css");
@import url("datetime_picker/bootstrap-datetimepicker.css");
@import url("tagEditor/jquery.tag-editor.css");
@import url("global.css");
#loading-gif {
width: 40px;

23
static/src/css/global.css
View File

@@ -1,13 +1,17 @@
html{
body, button, input, select, textarea, h1, h2, h3, h4, h5, h6 {
font-family: Georgia, STHeiti, "Microsoft Yahei", SimSun, "Droid Sans";
}
html {
height: 100%;
}
body{
height:100%; /*使内容高度和body一样*/
margin-bottom:-80px;/*向上缩减80像素，不至于footer超出屏幕可视范围*/
body {
height: 100%; /*使内容高度和body一样*/
margin-bottom: -80px; /*向上缩减80像素，不至于footer超出屏幕可视范围*/
}
.main{
.main {
padding-bottom: 120px;
}
@@ -30,10 +34,11 @@ label {
display: none
}
.right{
.right {
float: right;
}
.CodeMirror pre {
font-family: "Consolas","Bitstream Vera Sans Mono","Courier New", Courier, monospace !important;
}
pre {
font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
}

3
static/src/css/oj.css
View File

@@ -1,8 +1,7 @@
@import url("global.css");
@import url("bootstrap/bootstrap.min.css");
@import url("bootstrap/todc-bootstrap.min.css");
@import url("codeMirror/codemirror.css");
@import url("global.css");
#language-selector {
width: 130px;

BIN
static/src/img/chrome.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
static/src/img/firefox.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
static/src/img/ie.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

37
static/src/img/unsupported_browser.html Normal file
View File

@@ -0,0 +1,37 @@
<!DOCTYPE html>
<html lang="zh-cn">
<head>
<meta charset="UTF-8">
<title>不支持的浏览器</title>
<style>
body{
padding-top: 50px;;
}
div {
margin: 20px;
display: inline;
}
</style>
</head>
<body>
很抱歉，我们无法完全兼容低版本的 IE 浏览器，您可以
<a href="http://down.tech.sina.com.cn/page/40975.html">
<div>
<img src="/static/img/chrome.png">使用Chrome
</div>
</a>
<a href="https://www.mozilla.org/zh-CN/firefox/new/?scene=2#download-fx">
<div>
<img src="/static/img/firefox.png">使用FireFox
</div>
</a>
<a href="http://windows.microsoft.com/en-us/internet-explorer/download-ie">
<div>
<img src="/static/img/ie.png">升级IE
</div>
</a>
</body>
</html>