diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-11-28 22:04:04 -0500 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-11-28 22:04:04 -0500 |
commit | f3ccfd49f437c6080c9233a2e24ec602ebc49f60 (patch) | |
tree | 6e16fc77589074b31e64f547b63ebdf3798c012c /templates | |
parent | 6afaa6d392e97cc425e4ecdc82f3c1a3716986f4 (diff) | |
parent | 18f1a07afed3208ef4424305da8c6b1a34cf3aed (diff) | |
download | askbot-f3ccfd49f437c6080c9233a2e24ec602ebc49f60.tar.gz askbot-f3ccfd49f437c6080c9233a2e24ec602ebc49f60.tar.bz2 askbot-f3ccfd49f437c6080c9233a2e24ec602ebc49f60.zip |
merged with CNPROG branch
Diffstat (limited to 'templates')
-rw-r--r-- | templates/content/js/compress.bat | 10 | ||||
-rw-r--r-- | templates/content/js/flot-build.bat | 4 | ||||
-rw-r--r-- | templates/content/style/style.css | 1 |
3 files changed, 7 insertions, 8 deletions
diff --git a/templates/content/js/compress.bat b/templates/content/js/compress.bat index aa31271c..41e1882a 100644 --- a/templates/content/js/compress.bat +++ b/templates/content/js/compress.bat @@ -1,6 +1,6 @@ -#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 wmd\wmd.js -o wmd\wmd-min.js
-#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 wmd\showdown.js -o wmd\showdown-min.js
-#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 com.cnprog.post.js -o com.cnprog.post.pack.js
-java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 se_hilite_src.js -o se_hilite.js
-
+#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 wmd\wmd.js -o wmd\wmd-min.js +#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 wmd\showdown.js -o wmd\showdown-min.js +#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 com.cnprog.post.js -o com.cnprog.post.pack.js +java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 se_hilite_src.js -o se_hilite.js + pause
\ No newline at end of file diff --git a/templates/content/js/flot-build.bat b/templates/content/js/flot-build.bat index 28304966..fc715e3a 100644 --- a/templates/content/js/flot-build.bat +++ b/templates/content/js/flot-build.bat @@ -1,3 +1,3 @@ -java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 jquery.flot.js -o jquery.flot.pack.js
-
+java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 jquery.flot.js -o jquery.flot.pack.js + pause
\ No newline at end of file diff --git a/templates/content/style/style.css b/templates/content/style/style.css index ffa72676..4038e8a1 100644 --- a/templates/content/style/style.css +++ b/templates/content/style/style.css @@ -114,7 +114,6 @@ blockquote margin-left:20px;text-decoration:underline; font-size:12px; color:#333333;} #logo { padding: 5px 0px 0px 0px; - margin-bottom:-3px; } #navBar {float:clear;position:relative;display:block;width:960px;} #navBar .nav {margin:20px 0px 0px 16px; |