修改 build.js 将 css inline 化

This commit is contained in:
virusdefender 2015-08-01 23:16:48 +08:00
parent 27fda78bf2
commit f80d10917f
4 changed files with 14 additions and 13 deletions

3
.gitignore vendored
View File

@ -55,4 +55,5 @@ db.db
#*.out
db.sqlite3
.DS_Store
log/
log/
release/

View File

@ -1,3 +1,5 @@
@import url("bootstrap/bootstrap.min.css");
@import url("bootstrap/todc-bootstrap.min.css");
html, body {
height: 100%;
}

View File

@ -1,6 +1,6 @@
({
// RequireJS 通过一个相对的路径 baseUrl来加载所有代码。baseUrl通常被设置成data-main属性指定脚本的同级目录。
baseUrl: ".",
baseUrl: "js/",
// 第三方脚本模块的别名,jquery比libs/jquery-1.11.1.min.js简洁明了
paths: {
//百度webuploader
@ -16,7 +16,6 @@
oj: "app/oj",
"bs_alert": "utils/bs_alert",
//formValidation 不要在代码中单独使用而是使用和修改utils/validation
base: "lib/formValidation/base",
helper: "lib/formValidation/helper",
@ -45,8 +44,12 @@
shim: {
"bootstrap": {"deps": ['jquery']}
},
name: "oj",
out: "oj-build.js",
findNestedDependencies: true
//wrapShim: true
findNestedDependencies: true,
appDir: "../",
dir: "../../release/",
modules: [
{
name: "oj"
}
]
})

View File

@ -8,11 +8,6 @@
<title>在线评测系统</title>
<!-- common css begin -->
<link href="/static/css/bootstrap/bootstrap.min.css" rel="stylesheet">
<link href="/static/css/bootstrap/todc-bootstrap.min.css" rel="stylesheet">
<!-- common css end -->
<!-- custom css begin -->
{% block css_block %}{% endblock %}
<!-- custom css end -->
@ -95,7 +90,7 @@
<!-- custom body end -->
<script src="/static/js/config.js"></script>
<script src="/static/js/require.js" data-main="/static/js/oj-build.js"></script>
<script src="/static/js/require.js" data-main="/static/js/app/oj.js"></script>
<!-- footer begin -->
<div class="footer">
<p class="text-muted text-center">Copyright © 2015 青岛大学信息工程学院 创新实验室</p>